Wrap alignment with annotations

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

diff --git a/src/jalview/gui/IdPanel.java b/src/jalview/gui/IdPanel.java
index 201516f..011502b 100755 (executable)
--- a/src/jalview/gui/IdPanel.java
+++ b/src/jalview/gui/IdPanel.java
@@ -70,6 +70,16 @@ public class IdPanel extends JPanel implements MouseListener,
     {\r
     }\r
 \r
+    int getWrappedY(int y)\r
+    {\r
+      int hgap = av.charHeight;\r
+      if (av.scaleAboveWrapped)\r
+        hgap += av.charHeight;\r
+\r
+      return y - hgap;\r
+    }\r
+\r
+\r
     /**\r
      * DOCUMENT ME!\r
      *\r
@@ -83,7 +93,7 @@ public class IdPanel extends JPanel implements MouseListener,
 \r
         if (av.getWrapAlignment())\r
         {\r
-            y -= (2 * av.charHeight);\r
+            y = getWrappedY(y);\r
         }\r
 \r
         int seq = av.getIndex(y);\r
@@ -125,7 +135,7 @@ public class IdPanel extends JPanel implements MouseListener,
 \r
       if (av.getWrapAlignment())\r
       {\r
-        y -= (2 * av.charHeight);\r
+         y = getWrappedY(y);\r
       }\r
 \r
       //DEFAULT LINK IS FIRST IN THE LINK LIST\r
@@ -205,7 +215,7 @@ public class IdPanel extends JPanel implements MouseListener,
 \r
         if (av.getWrapAlignment())\r
         {\r
-            y -= (2 * av.charHeight);\r
+            y = getWrappedY(y);\r
         }\r
 \r
         int seq = av.getIndex(y);\r