From 5a74e4957b86821f2fd0752d1d9bc46ebb3cfdc6 Mon Sep 17 00:00:00 2001
From: amwaterhouse <Andrew Waterhouse>
Date: Fri, 28 Apr 2006 16:37:58 +0000
Subject: [PATCH] Watch for exceeding width limit

---
 src/jalview/appletgui/ScalePanel.java |   10 ++++++++++
 src/jalview/gui/ScalePanel.java       |   13 +++++++++++++
 2 files changed, 23 insertions(+)

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