X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FScalePanel.java;h=04fb22bd00207a7d254826e6be9fcba0c278d9aa;hb=38889ac4815d29d1fbb040ff1dbbc47fe89ea87e;hp=17281019cd3311d5136a6399a643a225ca8074b8;hpb=ef2426c8eeb0fec50772d3aa9e86481499d4b7d2;p=jalview.git

diff --git a/src/jalview/appletgui/ScalePanel.java b/src/jalview/appletgui/ScalePanel.java
index 1728101..04fb22b 100755
--- a/src/jalview/appletgui/ScalePanel.java
+++ b/src/jalview/appletgui/ScalePanel.java
@@ -44,8 +44,8 @@ import java.awt.event.MouseMotionListener;
 import java.beans.PropertyChangeEvent;
 import java.util.List;
 
-public class ScalePanel extends Panel implements MouseMotionListener,
-        MouseListener, ViewportListenerI
+public class ScalePanel extends Panel
+        implements MouseMotionListener, MouseListener, ViewportListenerI
 {
 
   protected int offy = 4;
@@ -95,7 +95,8 @@ public class ScalePanel extends Panel implements MouseMotionListener,
 
     min = res;
     max = res;
-    if ((evt.getModifiers() & InputEvent.BUTTON3_MASK) == InputEvent.BUTTON3_MASK)
+    if ((evt.getModifiers()
+            & InputEvent.BUTTON3_MASK) == InputEvent.BUTTON3_MASK)
     {
       rightMouseButtonPressed(evt, res);
     }
@@ -140,7 +141,7 @@ public class ScalePanel extends Panel implements MouseMotionListener,
       sg.setStartRes(min);
       sg.setEndRes(max);
     }
-    ap.paintAlignment(true);
+    ap.paintAlignment(false, false);
     av.sendSelection();
   }
 
@@ -157,7 +158,8 @@ public class ScalePanel extends Panel implements MouseMotionListener,
     PopupMenu pop = new PopupMenu();
     if (reveal != null)
     {
-      MenuItem item = new MenuItem(MessageManager.getString("label.reveal"));
+      MenuItem item = new MenuItem(
+              MessageManager.getString("label.reveal"));
       item.addActionListener(new ActionListener()
       {
         @Override
@@ -165,7 +167,7 @@ public class ScalePanel extends Panel implements MouseMotionListener,
         {
           av.showColumn(reveal[0]);
           reveal = null;
-          ap.paintAlignment(true);
+          ap.paintAlignment(true, true);
           av.sendSelection();
         }
       });
@@ -181,7 +183,7 @@ public class ScalePanel extends Panel implements MouseMotionListener,
           {
             av.showAllHiddenColumns();
             reveal = null;
-            ap.paintAlignment(true);
+            ap.paintAlignment(true, true);
             av.sendSelection();
           }
         });
@@ -200,14 +202,13 @@ public class ScalePanel extends Panel implements MouseMotionListener,
         public void actionPerformed(ActionEvent e)
         {
           av.hideColumns(res, res);
-          if (av.getSelectionGroup() != null
-                  && av.getSelectionGroup().getSize() == av.getAlignment()
-                          .getHeight())
+          if (av.getSelectionGroup() != null && av.getSelectionGroup()
+                  .getSize() == av.getAlignment().getHeight())
           {
             av.setSelectionGroup(null);
           }
 
-          ap.paintAlignment(true);
+          ap.paintAlignment(true, true);
           av.sendSelection();
         }
       });
@@ -238,7 +239,7 @@ public class ScalePanel extends Panel implements MouseMotionListener,
 
     if (!stretchingGroup)
     {
-      ap.paintAlignment(false);
+      ap.paintAlignment(false, false);
 
       return;
     }
@@ -255,7 +256,7 @@ public class ScalePanel extends Panel implements MouseMotionListener,
     }
 
     stretchingGroup = false;
-    ap.paintAlignment(false);
+    ap.paintAlignment(false, false);
     av.sendSelection();
   }
 
@@ -284,7 +285,7 @@ public class ScalePanel extends Panel implements MouseMotionListener,
     {
       stretchingGroup = true;
       cs.stretchGroup(res, sg, min, max);
-      ap.paintAlignment(false);
+      ap.paintAlignment(false, false);
     }
   }
 
@@ -344,8 +345,8 @@ public class ScalePanel extends Panel implements MouseMotionListener,
      */
     if (!av.getWrapAlignment())
     {
-      drawScale(g, av.getRanges().getStartRes(),
-              av.getRanges().getEndRes(), getSize().width, getSize().height);
+      drawScale(g, av.getRanges().getStartRes(), av.getRanges().getEndRes(),
+              getSize().width, getSize().height);
     }
   }
 
@@ -446,10 +447,13 @@ public class ScalePanel extends Panel implements MouseMotionListener,
             continue;
           }
 
-          gg.fillPolygon(new int[] {
-              -1 + res * avCharWidth - avcharHeight / 4,
-              -1 + res * avCharWidth + avcharHeight / 4,
-              -1 + res * avCharWidth }, new int[] { y, y, y + 2 * yOf }, 3);
+          gg.fillPolygon(
+                  new int[]
+                  { -1 + res * avCharWidth - avcharHeight / 4,
+                      -1 + res * avCharWidth + avcharHeight / 4,
+                      -1 + res * avCharWidth },
+                  new int[]
+                  { y, y, y + 2 * yOf }, 3);
         }
       }
     }
@@ -464,7 +468,9 @@ public class ScalePanel extends Panel implements MouseMotionListener,
     // Here we only want to fastpaint on a scroll, with resize using a normal
     // paint, so scroll events are identified as changes to the horizontal or
     // vertical start value.
-    if (evt.getPropertyName().equals(ViewportRanges.STARTRES))
+    if (evt.getPropertyName().equals(ViewportRanges.STARTRES)
+            || evt.getPropertyName().equals(ViewportRanges.STARTRESANDSEQ)
+            || evt.getPropertyName().equals(ViewportRanges.MOVE_VIEWPORT))
     {
       // scroll event, repaint panel
       repaint();