Modified for wrappingAlignment

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

diff --git a/src/jalview/gui/IdPanel.java b/src/jalview/gui/IdPanel.java
index ff175aa..0e528a2 100755 (executable)
--- a/src/jalview/gui/IdPanel.java
+++ b/src/jalview/gui/IdPanel.java
@@ -73,6 +73,8 @@ public class IdPanel extends JPanel implements MouseListener, MouseMotionListene
 \r
   public void mouseDragged(MouseEvent e) {\r
     int y = e.getY();\r
+    if(av.getWrapAlignment())\r
+      y-=2*av.charHeight;\r
     int seq = av.getIndex(y);\r
 \r
     if (seq < lastid)\r
@@ -89,7 +91,11 @@ public class IdPanel extends JPanel implements MouseListener, MouseMotionListene
   {\r
     if (e.getClickCount() == 2)\r
     {\r
-       int seq = av.getIndex(e.getY());\r
+       int y = e.getY();\r
+       if(av.getWrapAlignment())\r
+         y-=2*av.charHeight;\r
+\r
+       int seq = av.getIndex(y);\r
        String id = av.getAlignment().getSequenceAt(seq).getName();\r
 \r
        try{\r
@@ -108,9 +114,24 @@ public class IdPanel extends JPanel implements MouseListener, MouseMotionListene
       return;\r
 \r
     int y = e.getY();\r
+    if(av.getWrapAlignment())\r
+      y-=2*av.charHeight;\r
+\r
     int seq = av.getIndex(y);\r
 \r
-    selectedSequenceGroup = av.getRubberbandGroup();\r
+    if (javax.swing.SwingUtilities.isRightMouseButton(e))\r
+    {\r
+      jalview.gui.PopupMenu pop = new jalview.gui.PopupMenu(alignPanel,\r
+          av.getAlignment().getSequenceAt(seq));\r
+      pop.show(this, e.getX(), y);\r
+      return;\r
+    }\r
+\r
+\r
+\r
+    if(av.getRubberbandGroup()!=null && (av.getRubberbandGroup().getSize() == av.getSelection().size()))\r
+          selectedSequenceGroup = av.getRubberbandGroup();\r
+\r
     if (selectedSequenceGroup == null)\r
     {\r
       selectedSequenceGroup = new SequenceGroup();\r
@@ -125,12 +146,6 @@ public class IdPanel extends JPanel implements MouseListener, MouseMotionListene
 \r
     lastid = seq;\r
 \r
-    if( javax.swing.SwingUtilities.isRightMouseButton(e))\r
-     {\r
-       jalview.gui.PopupMenu pop = new jalview.gui.PopupMenu(alignPanel, av.getAlignment().getSequenceAt(seq) );\r
-       pop.show(this, e.getX(), y);\r
-     }\r
-\r
 \r
     return;\r
   }\r