X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FIdPanel.java;h=32f34250aaa2bd24d5a8a36230377b6b6c125a6e;hb=eb0eed334dc71bf05c86b4f7413b36e675722db9;hp=ff175aa3a885a003c1d34eece767b871a8bb413b;hpb=5f0327b9a1f7adedb23e9188aef61e98dd14a1c2;p=jalview.git

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