X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FScalePanel.java;h=8f32d8cf164aa77ffbaa9f8cbf85899383d1a146;hb=3af1fc9be996fd7a943a72e137b3ac6b49862770;hp=07be3d0997edf08a6b4c293dafde4bc4b1eaeab7;hpb=d2a92c8d68fbbc76964abe962cfd42cc4dfa6d34;p=jalview.git

diff --git a/src/jalview/gui/ScalePanel.java b/src/jalview/gui/ScalePanel.java
index 07be3d0..8f32d8c 100755
--- a/src/jalview/gui/ScalePanel.java
+++ b/src/jalview/gui/ScalePanel.java
@@ -43,6 +43,7 @@ public class ScalePanel extends JPanel implements MouseMotionListener, MouseList
     boolean stretchingGroup = false;
     int min; //used by mouseDragged to see if user
     int max; //used by mouseDragged to see if user
+    boolean mouseDragging = false;
 
     // wants to delete columns
     public ScalePanel(AlignViewport av, AlignmentPanel ap)
@@ -72,7 +73,7 @@ public class ScalePanel extends JPanel implements MouseMotionListener, MouseList
         min = res;
         max = res;
 
-        if(reveal != null && SwingUtilities.isRightMouseButton(evt))
+      /*  if(reveal != null && SwingUtilities.isRightMouseButton(evt))
           {
             JPopupMenu pop = new JPopupMenu();
             JMenuItem item = new JMenuItem("Reveal");
@@ -109,9 +110,10 @@ public class ScalePanel extends JPanel implements MouseMotionListener, MouseList
             pop.show(this, evt.getX(), evt.getY());
 
           }
-        else if (av.getColumnSelection().contains(res))
+        else*/
+      if (av.getColumnSelection().contains(res))
         {
-          if( SwingUtilities.isRightMouseButton(evt))
+        /*  if( SwingUtilities.isRightMouseButton(evt))
           {
             JPopupMenu pop = new JPopupMenu();
             JMenuItem item = new JMenuItem("Hide Columns");
@@ -129,7 +131,7 @@ public class ScalePanel extends JPanel implements MouseMotionListener, MouseList
             pop.show(this, evt.getX(), evt.getY());
 
           }
-          else
+          else*/
           {
             av.getColumnSelection().removeElement(res);
             av.setSelectionGroup(null);
@@ -161,6 +163,8 @@ public class ScalePanel extends JPanel implements MouseMotionListener, MouseList
      */
     public void mouseReleased(MouseEvent evt)
     {
+        mouseDragging = false;
+
         int res = (evt.getX() / av.getCharWidth()) + av.getStartRes();
 
         if(av.hasHiddenColumns)
@@ -195,6 +199,8 @@ public class ScalePanel extends JPanel implements MouseMotionListener, MouseList
      */
     public void mouseDragged(MouseEvent evt)
     {
+        mouseDragging = true;
+
         int res = (evt.getX() / av.getCharWidth()) + av.getStartRes();
 
         if(av.hasHiddenColumns)
@@ -210,6 +216,7 @@ public class ScalePanel extends JPanel implements MouseMotionListener, MouseList
             max = res;
         }
 
+
         SequenceGroup sg = av.getSelectionGroup();
 
         if (sg != null)
@@ -225,7 +232,7 @@ public class ScalePanel extends JPanel implements MouseMotionListener, MouseList
             {
                 sg.setEndRes(res);
             }
-            else if (res < sg.getStartRes())
+            if (res < sg.getStartRes())
             {
                 sg.setStartRes(res);
             }
@@ -246,8 +253,18 @@ public class ScalePanel extends JPanel implements MouseMotionListener, MouseList
         }
     }
 
-    public void mouseEntered(MouseEvent evt){}
-    public void mouseExited(MouseEvent evt){}
+    public void mouseEntered(MouseEvent evt)
+    {
+      if(mouseDragging)
+        ap.seqPanel.scrollCanvas(null);
+    }
+
+    public void mouseExited(MouseEvent evt)
+    {
+      if(mouseDragging)
+        ap.seqPanel.scrollCanvas(evt);
+    }
+
     public void mouseClicked(MouseEvent evt){}
 
     public void mouseMoved(MouseEvent evt)