From: amwaterhouse <Andrew Waterhouse>
Date: Mon, 29 Aug 2005 10:45:55 +0000 (+0000)
Subject: Edit and annotate wrapped alignment
X-Git-Tag: Release_2_05~10
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=a6359c6eb746b06030b22135ed20417b971f580f;p=jalview.git

Edit and annotate wrapped alignment
---

diff --git a/src/jalview/appletgui/SeqPanel.java b/src/jalview/appletgui/SeqPanel.java
index 71f2d14..51cb844 100755
--- a/src/jalview/appletgui/SeqPanel.java
+++ b/src/jalview/appletgui/SeqPanel.java
@@ -705,12 +705,15 @@ public class SeqPanel
     int res = findRes(evt);
     int y = findSeq(evt);
 
+    if(y>=av.alignment.getHeight())
+      y = av.alignment.getHeight()-1;
+
     if (stretchGroup == null)
     {
       return;
     }
 
-    if (res > av.alignment.getWidth())
+    if (res > av.alignment.getWidth() && !av.getWrapAlignment())
     {
       res = av.alignment.getWidth() - 1;
     }
@@ -807,7 +810,6 @@ public class SeqPanel
     {
       scrollThread = new ScrollThread();
     }
-
   }
 
   // this class allows scrolling off the bottom of the visible alignment
diff --git a/src/jalview/gui/SeqCanvas.java b/src/jalview/gui/SeqCanvas.java
index 6c2c07b..afb5a36 100755
--- a/src/jalview/gui/SeqCanvas.java
+++ b/src/jalview/gui/SeqCanvas.java
@@ -41,7 +41,6 @@ public class SeqCanvas extends JComponent
     int imgWidth;
     int imgHeight;
     AlignViewport av;
-    boolean showScores = false;
     boolean displaySearch = false;
     int[] searchResults = null;
     int chunkHeight;