X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fjbgui%2FGAlignmentPanel.java;h=bbbb1ab53e4924b138fe452a255d9314301573a8;hb=09b64bea954c283bde1d21c0a230f51f1ae89373;hp=58957b3c347610d224fe5ebe795091d01c448e8a;hpb=7c1e9288401f2e32b91d46e20131b3e23769236c;p=jalview.git

diff --git a/src/jalview/jbgui/GAlignmentPanel.java b/src/jalview/jbgui/GAlignmentPanel.java
index 58957b3..bbbb1ab 100755
--- a/src/jalview/jbgui/GAlignmentPanel.java
+++ b/src/jalview/jbgui/GAlignmentPanel.java
@@ -31,12 +31,14 @@ public class GAlignmentPanel extends JPanel
   BorderLayout borderLayout6 = new BorderLayout();
   ButtonGroup buttonGroup1 = new ButtonGroup();
   BorderLayout borderLayout7 = new BorderLayout();
-  JPanel jPanel1 = new JPanel();
-  FlowLayout flowLayout1 = new FlowLayout();
   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()
   {
@@ -72,32 +74,29 @@ public class GAlignmentPanel extends JPanel
     idPanelHolder.setLayout(borderLayout5);
     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);
-    hscroll.setMinimumSize(new Dimension(250, 16));
-    hscroll.setPreferredSize(new Dimension(250, 16));
-    vscroll.setEnabled(true);
-    jPanel1.setBackground(new Color(220, 220, 220));
-    jPanel1.setLayout(flowLayout1);
-    flowLayout1.setHgap(0);
-    flowLayout1.setVgap(0);
     jPanel3.setLayout(borderLayout9);
-    secondaryPanelHolder.setBackground(Color.cyan);
     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);
     sequenceHolderPanel.add(jPanel3,  BorderLayout.SOUTH);
     jPanel3.add(scorePanelHolder, BorderLayout.CENTER);
-    jPanel3.add(secondaryPanelHolder,  BorderLayout.SOUTH);
+  //  jPanel3.add(secondaryPanelHolder,  BorderLayout.SOUTH);
     this.add(idPanelHolder, BorderLayout.WEST);
     idPanelHolder.add(idSpaceFillerPanel1,  BorderLayout.NORTH);
     idPanelHolder.add(idSpaceFillerPanel,  BorderLayout.SOUTH);
     this.add(jPanel1,  BorderLayout.SOUTH);
-    jPanel1.add(hscroll, null);
+    jPanel1.add(hscroll, BorderLayout.CENTER);
+    jPanel1.add(hscrollFillerPanel,  BorderLayout.WEST);
   }