Watch for exceeding width limit

diff --git a/src/jalview/appletgui/ScalePanel.java b/src/jalview/appletgui/ScalePanel.java
index af226f3..fc7be6d 100755 (executable)
--- a/src/jalview/appletgui/ScalePanel.java
+++ b/src/jalview/appletgui/ScalePanel.java
@@ -104,6 +104,11 @@ public class ScalePanel
     int x = evt.getX();\r
     int res = x / av.getCharWidth() + av.getStartRes();\r
 \r
+    if(res> av.alignment.getWidth())\r
+    {\r
+      res = av.alignment.getWidth()-1;\r
+    }\r
+\r
     if (!av.getColumnSelection().contains(res))\r
     {\r
       av.getColumnSelection().addElement(res);\r
@@ -129,6 +134,11 @@ public class ScalePanel
     int x = evt.getX();\r
     int res = x / av.getCharWidth() + av.getStartRes();\r
 \r
+    if(res> av.alignment.getWidth())\r
+    {\r
+      res = av.alignment.getWidth()-1;\r
+    }\r
+\r
     SequenceGroup sg = av.getSelectionGroup();\r
     if (sg != null)\r
     {\r

diff --git a/src/jalview/gui/ScalePanel.java b/src/jalview/gui/ScalePanel.java
index e9082b8..9add747 100755 (executable)
--- a/src/jalview/gui/ScalePanel.java
+++ b/src/jalview/gui/ScalePanel.java
@@ -167,6 +167,11 @@ public class ScalePanel extends JPanel implements MouseMotionListener, MouseList
 \r
         int res = (evt.getX() / av.getCharWidth()) + av.getStartRes();\r
 \r
+        if(res> av.alignment.getWidth())\r
+        {\r
+          res = av.alignment.getWidth()-1;\r
+        }\r
+\r
         if(av.hasHiddenColumns)\r
           res = av.getColumnSelection().adjustForHiddenColumns(res);\r
 \r
@@ -206,6 +211,12 @@ public class ScalePanel extends JPanel implements MouseMotionListener, MouseList
         if(av.hasHiddenColumns)\r
           res = av.getColumnSelection().adjustForHiddenColumns(res);\r
 \r
+\r
+        if(res> av.alignment.getWidth())\r
+        {\r
+          res = av.alignment.getWidth()-1;\r
+        }\r
+\r
         if (res < min)\r
         {\r
             min = res;\r
@@ -217,6 +228,8 @@ public class ScalePanel extends JPanel implements MouseMotionListener, MouseList
         }\r
 \r
 \r
+\r
+\r
         SequenceGroup sg = av.getSelectionGroup();\r
 \r
         if (sg != null)\r