X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FSeqPanel.java;h=468fadb91d40b98ccb3e31060c3647818135d229;hb=c865a01627208f07db46ae7d28c06f39d83924ee;hp=b76873aac2e3fe33639c173f1be4d359f37525f9;hpb=287138821f2385a01d4c576bee2e7872efe15cb5;p=jalview.git

diff --git a/src/jalview/gui/SeqPanel.java b/src/jalview/gui/SeqPanel.java
index b76873a..468fadb 100755
--- a/src/jalview/gui/SeqPanel.java
+++ b/src/jalview/gui/SeqPanel.java
@@ -42,7 +42,7 @@ public class SeqPanel extends JPanel
 
       public void mouseDragged(MouseEvent evt)
       {
-        if(evt.isShiftDown() || evt.isAltDown())
+        if(evt.isShiftDown() || evt.isAltDown() || evt.isControlDown())
           doMouseDragged(evt);
         else
           doMouseDraggedDefineMode(evt);
@@ -53,14 +53,14 @@ public class SeqPanel extends JPanel
     {
       public void mouseReleased(MouseEvent evt)
       {
-        if(evt.isShiftDown() || evt.isAltDown())
+        if(evt.isShiftDown() || evt.isAltDown() || evt.isControlDown())
           doMouseReleased(evt);
         else
           doMouseReleasedDefineMode(evt);
       }
       public void mousePressed(MouseEvent evt)
       {
-        if(evt.isShiftDown() || evt.isAltDown())
+        if(evt.isShiftDown() || evt.isAltDown() || evt.isControlDown())
           doMousePressed(evt);
         else
           doMousePressedDefineMode(evt);
@@ -184,7 +184,7 @@ public class SeqPanel extends JPanel
     if (res != lastres)
     {
 	// Group editing
-	if (evt.isAltDown())
+	if (evt.isAltDown() || evt.isControlDown())
         {
 	  SequenceGroup sg = av.getAlignment().findGroup(startseq);
           if (sg != null)
@@ -208,10 +208,20 @@ public class SeqPanel extends JPanel
 
                 if(!deleteAllowed && allGaps)
                   deleteAllowed = true;
-
               }
             }
 
+            // drag to right
+            if (res < av.getAlignment().getWidth() && res > lastres)
+                sg.setEndRes(sg.getEndRes() + 1);
+
+            // drag to left
+            else if (deleteAllowed && res < av.getAlignment().getWidth() &&
+                     res < lastres)
+                sg.setEndRes(sg.getEndRes() - 1);
+
+
+
 
             for (int i = 0; i < sg.getSize(); i++)
             {
@@ -323,6 +333,20 @@ public class SeqPanel extends JPanel
             || stretchGroup.getEndRes()<res)
      {
        stretchGroup = null;
+
+       SequenceGroup[] allGroups = av.alignment.findAllGroups( (Sequence) av.
+           getAlignment().
+           getSequenceAt(seq));
+
+       if (allGroups != null)
+         for (int i = 0; i < allGroups.length; i++)
+           if (allGroups[i].getStartRes() <= res &&
+               allGroups[i].getEndRes() >= res)
+           {
+             stretchGroup = allGroups[i];
+             av.setRubberbandGroup(stretchGroup);
+             break;
+           }
      }
 
     if(stretchGroup==null)