Set wrapped mode even if false

[jalview.git] / src / jalview / gui / ScalePanel.java

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