fix: disabled menus should be able to set key shortcut. next and prev doc shortcut

Author: abose

src/command/DefaultMenus.js

@@ -76,6 +76,8 @@ define(function (require, exports, module) {
     const openFileShortcut = isDesktop ? "Ctrl-O" : "";
     const openFolderShortcut = isBrowser ? "Ctrl-O" : "";
     const reopenClosedShortcut = isBrowser ? "" : "Ctrl-Shift-T";
+    const nextDocShortcut = isBrowser ? "Alt-PageDown" : "Ctrl-PageDown";
+    const prevDocShortcut = isBrowser ? "Alt-PageUp" : "Ctrl-PageUp";
 
     AppInit.htmlReady(function () {
         /**
@@ -237,8 +239,8 @@ define(function (require, exports, module) {
         menu.addMenuDivider();
         menu.addMenuItem(Commands.NAVIGATE_NEXT_DOC);
         menu.addMenuItem(Commands.NAVIGATE_PREV_DOC);
-        menu.addMenuItem(Commands.NAVIGATE_NEXT_DOC_LIST_ORDER);
-        menu.addMenuItem(Commands.NAVIGATE_PREV_DOC_LIST_ORDER);
+        menu.addMenuItem(Commands.NAVIGATE_NEXT_DOC_LIST_ORDER, nextDocShortcut);
+        menu.addMenuItem(Commands.NAVIGATE_PREV_DOC_LIST_ORDER, prevDocShortcut);
         menu.addMenuDivider();
         menu.addMenuItem(Commands.NAVIGATE_SHOW_IN_FILE_TREE);
         menu.addMenuDivider();

src/command/Menus.js

@@ -651,7 +651,9 @@ define(function (require, exports, module) {
             $menuItem.on("mouseenter", function () {
                 // This is to prevent size jumps when the keyboard
                 // icon hides and shows as selection changes
+                $menuAnchor.addClass("use-invisible-for-width-compute");
                 const currentWidth = $(this).width(); // Get the current width
+                $menuAnchor.removeClass("use-invisible-for-width-compute");
                 $(this).css('min-width', currentWidth + 'px');
                 self.closeSubMenu();
                 // now show selection
@@ -819,10 +821,13 @@ define(function (require, exports, module) {
                          "<span class='right-pusher'></span>" +
                          "<span>&rtrif;</span>"   +
                          "</a></li>");
+        const $menuAnchor = $menuItem.find(".menuAnchor");
 
         let self = this;
         $menuItem.on("mouseenter", function(e) {
+            $menuAnchor.addClass("use-invisible-for-width-compute");
             const currentWidth = $(this).width(); // Get the current width
+            $menuAnchor.removeClass("use-invisible-for-width-compute");
             $(this).css('min-width', currentWidth + 'px'); // Set min-width to the current width
             if (self.openSubMenu && self.openSubMenu.id === menu.id) {
                 return;

src/extensionsIntegrated/DisplayShortcuts/vscode.json

@@ -13,5 +13,10 @@
   "Ctrl-B": "view.toggleSidebar",
   "Ctrl-J": "view.togglePanels",
   "Ctrl-Shift-X": "file.extensionManager",
-  "Alt-Z": "view.toggleWordWrap"
+  "Alt-Z": "view.toggleWordWrap",
+  "Ctrl-Alt--": "navigation.jump.back",
+  "Ctrl-Shift-_": "navigation.jump.fwd",
+  "Ctrl-P": "navigate.quickOpen",
+  "Ctrl-Shift-P": "cmd.keyboardNavUI",
+  "Ctrl-Shift-O": "navigate.gotoDefinition"
 }

src/styles/brackets_patterns_override.less

@@ -543,16 +543,21 @@ a:focus {
     }
 }
 
-.menuAnchor.selected .menu-shortcut:not(.fixed-shortcut) {
+.menuAnchor:hover .menu-shortcut:not(.fixed-shortcut) {
     display: none;
 }
 
-.menuAnchor.selected .keyboard-icon {
+.menuAnchor.use-invisible-for-width-compute:hover .menu-shortcut:not(.fixed-shortcut) {
+    visibility: hidden;
+    display: unset;
+}
+
+.menuAnchor:hover .keyboard-icon {
     cursor: pointer;
     visibility: visible;
 }
 
-.menuAnchor.selected .keyboard-icon:hover {
+.menuAnchor:hover .keyboard-icon:hover {
     color: @bc-secondary-btn-border;
 }