JAL-3345 small tidying

diff --git a/src/jalview/gui/ScalePanel.java b/src/jalview/gui/ScalePanel.java
index bfa903a..f525100 100755 (executable)
--- a/src/jalview/gui/ScalePanel.java
+++ b/src/jalview/gui/ScalePanel.java
@@ -587,7 +587,6 @@ public class ScalePanel extends JPanel
 
   public boolean isMouseDragging()
   {
-    // TODO Auto-generated method stub
     return mouseDragging;
   }
 

diff --git a/src/jalview/gui/SeqPanel.java b/src/jalview/gui/SeqPanel.java
index 26ec081..2e0c1f4 100644 (file)
--- a/src/jalview/gui/SeqPanel.java
+++ b/src/jalview/gui/SeqPanel.java
@@ -1940,18 +1940,23 @@ public class SeqPanel extends JPanel
   @Override
   public void mouseExited(MouseEvent e)
   {
-    if (ap.getScalePanel().isMouseDragging())
-    {
-      ap.getScalePanel().mouseExited(e);
-      return;
-    }
     lastMousePosition = null;
     ap.alignFrame.setStatus(" ");
+
     if (av.getWrapAlignment())
     {
       return;
     }
-    if (mouseDragging && scrollThread == null)
+
+    /*
+     * start scrolling if mouse dragging, whether the drag started
+     * in the scale panel or this panel
+     */
+    if (ap.getScalePanel().isMouseDragging())
+    {
+      ap.getScalePanel().mouseExited(e);
+    }
+    else if (mouseDragging && scrollThread == null)
     {
       startScrolling(e.getPoint());
     }