X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGAlignmentPanel.java;h=bbbb1ab53e4924b138fe452a255d9314301573a8;hb=09b64bea954c283bde1d21c0a230f51f1ae89373;hp=c361c1e02a840fc7b10dc7521b0147f5fc627552;hpb=1ecf6419aba86993b3c223bf5ec0fa79427baf85;p=jalview.git diff --git a/src/jalview/jbgui/GAlignmentPanel.java b/src/jalview/jbgui/GAlignmentPanel.java index c361c1e..bbbb1ab 100755 --- a/src/jalview/jbgui/GAlignmentPanel.java +++ b/src/jalview/jbgui/GAlignmentPanel.java @@ -25,12 +25,20 @@ public class GAlignmentPanel extends JPanel protected JPanel scalePanelHolder = new JPanel(); protected JPanel idPanelHolder = new JPanel(); BorderLayout borderLayout5 = new BorderLayout(); - JPanel jPanel3 = new JPanel(); + protected JPanel idSpaceFillerPanel1 = new JPanel(); protected JPanel idSpaceFillerPanel = new JPanel(); BorderLayout borderLayout4 = new BorderLayout(); BorderLayout borderLayout6 = new BorderLayout(); ButtonGroup buttonGroup1 = new ButtonGroup(); BorderLayout borderLayout7 = new BorderLayout(); + JPanel jPanel3 = new JPanel(); + protected JPanel secondaryPanelHolder = new JPanel(); + BorderLayout borderLayout8 = new BorderLayout(); + BorderLayout borderLayout9 = new BorderLayout(); + JPanel jPanel1 = new JPanel(); + BorderLayout borderLayout10 = new BorderLayout(); + protected JPanel hscrollFillerPanel = new JPanel(); + BorderLayout borderLayout11 = new BorderLayout(); public GAlignmentPanel() { @@ -64,22 +72,31 @@ public class GAlignmentPanel extends JPanel scorePanelHolder.setPreferredSize(new Dimension(10, 80)); scorePanelHolder.setLayout(borderLayout4); idPanelHolder.setLayout(borderLayout5); - jPanel3.setBackground(Color.white); - jPanel3.setPreferredSize(new Dimension(10, 30)); + idSpaceFillerPanel1.setBackground(Color.white); + idSpaceFillerPanel1.setPreferredSize(new Dimension(10, 30)); + idSpaceFillerPanel1.setLayout(borderLayout11); idSpaceFillerPanel.setBackground(Color.white); idSpaceFillerPanel.setPreferredSize(new Dimension(10, 80)); hscroll.setOrientation(JScrollBar.HORIZONTAL); - vscroll.setEnabled(true); - sequenceHolderPanel.add(scorePanelHolder, BorderLayout.SOUTH); + jPanel3.setLayout(borderLayout9); + secondaryPanelHolder.setLayout(borderLayout8); + jPanel1.setLayout(borderLayout10); + hscrollFillerPanel.setBackground(Color.white); + jPanel1.setBackground(Color.white); sequenceHolderPanel.add(scalePanelHolder, BorderLayout.NORTH); sequenceHolderPanel.add(seqPanelHolder, BorderLayout.CENTER); + seqPanelHolder.add(vscroll, BorderLayout.EAST); this.add(jPanel2, BorderLayout.CENTER); jPanel2.add(sequenceHolderPanel, BorderLayout.CENTER); - seqPanelHolder.add(vscroll, BorderLayout.EAST); - seqPanelHolder.add(hscroll, BorderLayout.SOUTH); + sequenceHolderPanel.add(jPanel3, BorderLayout.SOUTH); + jPanel3.add(scorePanelHolder, BorderLayout.CENTER); + // jPanel3.add(secondaryPanelHolder, BorderLayout.SOUTH); this.add(idPanelHolder, BorderLayout.WEST); - idPanelHolder.add(jPanel3, BorderLayout.NORTH); + idPanelHolder.add(idSpaceFillerPanel1, BorderLayout.NORTH); idPanelHolder.add(idSpaceFillerPanel, BorderLayout.SOUTH); + this.add(jPanel1, BorderLayout.SOUTH); + jPanel1.add(hscroll, BorderLayout.CENTER); + jPanel1.add(hscrollFillerPanel, BorderLayout.WEST); }