X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FScalePanel.java;h=262d1e1a26d184b448e3861fde87a37e4af6f179;hb=3596077c79b7aa2051b9aaa978481004b513101c;hp=29e338cc88fb910c8f794cec3f87c807909b056a;hpb=628a29c56cc280f434f3568f3bf79555e1c77726;p=jalview.git

diff --git a/src/jalview/gui/ScalePanel.java b/src/jalview/gui/ScalePanel.java
index 29e338c..262d1e1 100755
--- a/src/jalview/gui/ScalePanel.java
+++ b/src/jalview/gui/ScalePanel.java
@@ -81,7 +81,7 @@ public class ScalePanel extends JPanel implements MouseMotionListener, MouseList
             {
               public void actionPerformed(ActionEvent e)
               {
-                av.getColumnSelection().revealHiddenColumns(reveal[0], av);
+                av.showColumn(reveal[0]);
                 reveal = null;
                 ap.repaint();
                 if(ap.overviewPanel != null)
@@ -90,14 +90,14 @@ public class ScalePanel extends JPanel implements MouseMotionListener, MouseList
             });
             pop.add(item);
 
-            if(av.getColumnSelection().hiddenColumns.size()>1)
+            if(av.getColumnSelection().getHiddenColumns().size()>1)
             {
               item = new JMenuItem("Reveal All");
               item.addActionListener(new ActionListener()
               {
                 public void actionPerformed(ActionEvent e)
                 {
-                  av.getColumnSelection().revealAllHiddenColumns(av);
+                  av.showAllHiddenColumns();
                   reveal = null;
                   ap.repaint();
                   if(ap.overviewPanel != null)
@@ -121,7 +121,7 @@ public class ScalePanel extends JPanel implements MouseMotionListener, MouseList
             {
               public void actionPerformed(ActionEvent e)
               {
-                av.hideColumns(res, res+1);
+                av.hideColumns(res, res);
                 ap.repaint();
                 if(ap.overviewPanel != null)
                   ap.overviewPanel.updateOverviewImage();
@@ -207,6 +207,8 @@ public class ScalePanel extends JPanel implements MouseMotionListener, MouseList
         mouseDragging = true;
 
         int res = (evt.getX() / av.getCharWidth()) + av.getStartRes();
+        if(res<0)
+          res = 0;
 
         if(av.hasHiddenColumns)
           res = av.getColumnSelection().adjustForHiddenColumns(res);
@@ -229,7 +231,6 @@ public class ScalePanel extends JPanel implements MouseMotionListener, MouseList
 
 
 
-
         SequenceGroup sg = av.getSelectionGroup();
 
         if (sg != null)