/*\r
* Jalview - A Sequence Alignment Editor and Viewer\r
- * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
+ * Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
*\r
* This program is free software; you can redistribute it and/or\r
* modify it under the terms of the GNU General Public License\r
case KeyEvent.VK_H:\r
{\r
boolean toggleSeqs = !evt.isControlDown();\r
- boolean toggleCols = !evt.isAltDown();\r
+ boolean toggleCols = !evt.isShiftDown();\r
+\r
boolean hide = false;\r
\r
SequenceGroup sg = av.getSelectionGroup();\r
alignFrame.hideSelSequences_actionPerformed(null);\r
hide = true;\r
}\r
- else\r
+ else if (!(toggleCols && av.colSel.getSelected().size() > 0))\r
alignFrame.showAllSeqs_actionPerformed(null);\r
}\r
\r
if (toggleCols)\r
{\r
if(av.colSel.getSelected().size() > 0)\r
+ {\r
alignFrame.hideSelColumns_actionPerformed(null);\r
+ if(!toggleSeqs)\r
+ av.selectionGroup = sg;\r
+ }\r
else if(!hide)\r
alignFrame.showAllColumns_actionPerformed(null);\r
}\r