fix: Prevents CTRL+P from being masked by a given accelerator defined…

… in FXML (#553) (#593) * fix: Prevents CTRL+P from being masked by a given accelerator defined in FXML. Hence allowing to show preview with CTRL+P. * Added showPreview method to MenuBarController. * Key code provided by event is now compared to KeyCode instance.
gluonhq · Nov 10, 2024 · ceece31 · ceece31
1 parent ad3003e
commit ceece31
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/app/src/main/java/com/oracle/javafx/scenebuilder/app/DocumentWindowController.java b/app/src/main/java/com/oracle/javafx/scenebuilder/app/DocumentWindowController.java
@@ -323,6 +323,13 @@ public enum ActionStatus {
             }
             event.consume();
         }
+
+        // Keep preview function working even if preview accelerator is 
+        // already occupied in FXML
+        if (KeyCode.P.equals(event.getCode()) && modifierDown) {
+            menuBarController.showPreview();
+            event.consume();
+        }
     };
 
     /*

diff --git a/app/src/main/java/com/oracle/javafx/scenebuilder/app/menubar/MenuBarController.java b/app/src/main/java/com/oracle/javafx/scenebuilder/app/menubar/MenuBarController.java
@@ -432,6 +432,8 @@ public class MenuBarController {
     private static final KeyCombination.Modifier modifier;
     private final Map<KeyCombination, MenuItem> keyToMenu = new HashMap<>();
 
+    private DocumentControlActionController previewController;
+
     static {
         if (EditorPlatform.IS_MAC) {
             modifier = KeyCombination.META_DOWN;
@@ -445,6 +447,12 @@ public MenuBarController(DocumentWindowController documentWindowController) {
         this.documentWindowController = documentWindowController;
     }
 
+    public void showPreview() {
+        if (previewController != null && previewController.canPerform()) {
+            previewController.perform();
+        }
+    }
+
     public MenuBar getMenuBar() {
 
         if (menuBar == null) {
@@ -1037,7 +1045,10 @@ public void perform() {
         /*
          * Preview menu
          */
-        showPreviewInWindowMenuItem.setUserData(new DocumentControlActionController(DocumentControlAction.SHOW_PREVIEW_WINDOW));
+        if (null == previewController) {
+            previewController = new DocumentControlActionController(DocumentControlAction.SHOW_PREVIEW_WINDOW); 
+        }
+        showPreviewInWindowMenuItem.setUserData(previewController);
         showPreviewInWindowMenuItem.setAccelerator(new KeyCodeCombination(KeyCode.P, modifier));
         showPreviewInDialogMenuItem.setUserData(new DocumentControlActionController(DocumentControlAction.SHOW_PREVIEW_DIALOG));
         caspianHighContrastThemeMenuItem.setUserData(new SetThemeActionController(EditorPlatform.Theme.CASPIAN_HIGH_CONTRAST));