JAL-1738 JAL-345 changed keystroke to ‘B’ (with modifiers) and added documentation

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

diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java
index 8a09c1d..6a389b6 100644 (file)
--- a/src/jalview/gui/AlignFrame.java
+++ b/src/jalview/gui/AlignFrame.java
@@ -669,6 +669,16 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
           toggleHiddenRegions(toggleSeqs, toggleCols);
           break;
         }
+        case KeyEvent.VK_B:
+        {
+          boolean toggleSel = evt.isControlDown() || evt.isMetaDown();
+          boolean modifyExisting = true; // always modify, don't clear
+                                         // evt.isShiftDown();
+          boolean invertHighlighted = evt.isAltDown();
+          avc.markHighlightedColumns(invertHighlighted, modifyExisting,
+                  toggleSel);
+          break;
+        }
         case KeyEvent.VK_PAGE_UP:
           if (viewport.getWrapAlignment())
           {
@@ -5934,10 +5944,11 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
   protected void selectHighlightedColumns_actionPerformed(
           ActionEvent actionEvent)
   {
+    // include key modifier check in case user selects from menu
     avc.markHighlightedColumns(
             (actionEvent.getModifiers() & ActionEvent.ALT_MASK) != 0,
-            (actionEvent.getModifiers() & ActionEvent.SHIFT_MASK) != 0,
-            (actionEvent.getModifiers() & ActionEvent.CTRL_MASK) != 0);
+            true,
+            (actionEvent.getModifiers() & (ActionEvent.META_MASK | ActionEvent.CTRL_MASK)) != 0);
   }
 }