X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FScalePanel.java;h=8f32d8cf164aa77ffbaa9f8cbf85899383d1a146;hb=6fc9aca27f606f6e3a0121597896e1a5dae35c36;hp=87e72dc4d34d97e0cc2225cd03bb95a7d20e27a2;hpb=31aef90c8108c0c781d77c7c32402a940b122aa2;p=jalview.git

diff --git a/src/jalview/gui/ScalePanel.java b/src/jalview/gui/ScalePanel.java
index 87e72dc..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");
@@ -83,6 +84,8 @@ public class ScalePanel extends JPanel implements MouseMotionListener, MouseList
                 av.getColumnSelection().revealHiddenColumns(reveal[0], av);
                 reveal = null;
                 ap.repaint();
+                if(ap.overviewPanel != null)
+                    ap.overviewPanel.updateOverviewImage();
               }
             });
             pop.add(item);
@@ -97,6 +100,8 @@ public class ScalePanel extends JPanel implements MouseMotionListener, MouseList
                   av.getColumnSelection().revealAllHiddenColumns(av);
                   reveal = null;
                   ap.repaint();
+                  if(ap.overviewPanel != null)
+                    ap.overviewPanel.updateOverviewImage();
                 }
               });
               pop.add(item);
@@ -105,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");
@@ -117,13 +123,15 @@ public class ScalePanel extends JPanel implements MouseMotionListener, MouseList
               {
                 av.getColumnSelection().hideColumns(res, av);
                 ap.repaint();
+                if(ap.overviewPanel != null)
+                  ap.overviewPanel.updateOverviewImage();
               }
             });
             pop.add(item);
             pop.show(this, evt.getX(), evt.getY());
 
           }
-          else
+          else*/
           {
             av.getColumnSelection().removeElement(res);
             av.setSelectionGroup(null);
@@ -155,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)
@@ -189,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)
@@ -204,6 +216,7 @@ public class ScalePanel extends JPanel implements MouseMotionListener, MouseList
             max = res;
         }
 
+
         SequenceGroup sg = av.getSelectionGroup();
 
         if (sg != null)
@@ -219,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);
             }
@@ -240,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)
@@ -260,8 +283,13 @@ public class ScalePanel extends JPanel implements MouseMotionListener, MouseList
         if(res+1==region[0] || res-1==region[1])
         {
           reveal = region;
+          ToolTipManager.sharedInstance().registerComponent(this);
+          this.setToolTipText("Reveal Hidden Columns with Right Mouse Button");
           break;
         }
+        else
+          this.setToolTipText(null);
+
       }
 
       repaint();
@@ -353,8 +381,8 @@ public class ScalePanel extends JPanel implements MouseMotionListener, MouseList
           {
             res = av.getColumnSelection().findHiddenRegionPosition( i )-startx;
 
-            gg.fillPolygon(new int[] { res*av.charWidth - 4,
-                                         res*av.charWidth + 4,
+            gg.fillPolygon(new int[] { res*av.charWidth - av.charHeight/4,
+                                         res*av.charWidth + av.charHeight/4,
                                          res*av.charWidth },
                                 new int[]
                                 {
@@ -362,6 +390,7 @@ public class ScalePanel extends JPanel implements MouseMotionListener, MouseList
                                     y + 8
                                 }, 3);
 
+
           }
 
           if (reveal != null && reveal[0] > startx && reveal[0] < endx)