X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAlignmentPanel.java;h=22cb9e363ce907f3e4a7e41cfef5bdeb026293e7;hb=174230b4233d9ce80f94527768d2cd2f76da11ab;hp=f7cc054f423723a8505eefe8d2f4936248380f75;hpb=2794d58ed2b048de8cad254bea750f69d859240d;p=jalview.git

diff --git a/src/jalview/gui/AlignmentPanel.java b/src/jalview/gui/AlignmentPanel.java
index f7cc054..22cb9e3 100755
--- a/src/jalview/gui/AlignmentPanel.java
+++ b/src/jalview/gui/AlignmentPanel.java
@@ -1,6 +1,6 @@
 /*
  * Jalview - A Sequence Alignment Editor and Viewer
- * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ * Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -238,7 +238,8 @@ public class AlignmentPanel extends GAlignmentPanel
           case KeyEvent.VK_H:
           {
             boolean toggleSeqs = !evt.isControlDown();
-            boolean toggleCols = !evt.isAltDown();
+            boolean toggleCols = !evt.isShiftDown();
+
             boolean hide = false;
 
             SequenceGroup sg = av.getSelectionGroup();
@@ -249,14 +250,18 @@ public class AlignmentPanel extends GAlignmentPanel
                  alignFrame.hideSelSequences_actionPerformed(null);
                  hide = true;
                }
-               else
+               else if (!(toggleCols && av.colSel.getSelected().size() > 0))
                  alignFrame.showAllSeqs_actionPerformed(null);
              }
 
              if (toggleCols)
              {
                if(av.colSel.getSelected().size() > 0)
+               {
                  alignFrame.hideSelColumns_actionPerformed(null);
+                 if(!toggleSeqs)
+                   av.selectionGroup = sg;
+               }
                else if(!hide)
                  alignFrame.showAllColumns_actionPerformed(null);
              }