Edit and annotate wrapped alignment

diff --git a/src/jalview/appletgui/SeqPanel.java b/src/jalview/appletgui/SeqPanel.java
index 71f2d14..51cb844 100755 (executable)
--- a/src/jalview/appletgui/SeqPanel.java
+++ b/src/jalview/appletgui/SeqPanel.java
@@ -705,12 +705,15 @@ public class SeqPanel
     int res = findRes(evt);\r
     int y = findSeq(evt);\r
 \r
     int res = findRes(evt);\r
     int y = findSeq(evt);\r
 \r

+    if(y>=av.alignment.getHeight())\r
+      y = av.alignment.getHeight()-1;\r
+\r

     if (stretchGroup == null)\r
     {\r
       return;\r
     }\r
 \r
     if (stretchGroup == null)\r
     {\r
       return;\r
     }\r
 \r

-    if (res > av.alignment.getWidth())\r
+    if (res > av.alignment.getWidth() && !av.getWrapAlignment())\r

     {\r
       res = av.alignment.getWidth() - 1;\r
     }\r
     {\r
       res = av.alignment.getWidth() - 1;\r
     }\r

@@ -807,7 +810,6 @@ public class SeqPanel
     {\r
       scrollThread = new ScrollThread();\r
     }\r
     {\r
       scrollThread = new ScrollThread();\r
     }\r

-\r

   }\r
 \r
   // this class allows scrolling off the bottom of the visible alignment\r
   }\r
 \r
   // this class allows scrolling off the bottom of the visible alignment\r

diff --git a/src/jalview/gui/SeqCanvas.java b/src/jalview/gui/SeqCanvas.java
index 6c2c07b..afb5a36 100755 (executable)
--- a/src/jalview/gui/SeqCanvas.java
+++ b/src/jalview/gui/SeqCanvas.java
@@ -41,7 +41,6 @@ public class SeqCanvas extends JComponent
     int imgWidth;\r
     int imgHeight;\r
     AlignViewport av;\r
     int imgWidth;\r
     int imgHeight;\r
     AlignViewport av;\r

-    boolean showScores = false;\r

     boolean displaySearch = false;\r
     int[] searchResults = null;\r
     int chunkHeight;\r
     boolean displaySearch = false;\r
     int[] searchResults = null;\r
     int chunkHeight;\r