Merge pull request #2210 from ControlSystemStudio/Issue_2208

Fixing full screen menu item
ControlSystemStudio · Apr 11, 2022 · 728552b · 728552b
2 parents d0f32c9 + 4a067f8
commit 728552b
Showing 1 changed file with 8 additions and 9 deletions.
diff --git a/core/ui/src/main/java/org/phoebus/ui/application/PhoebusApplication.java b/core/ui/src/main/java/org/phoebus/ui/application/PhoebusApplication.java
@@ -549,15 +549,7 @@ private MenuBar createMenu(final Stage stage) {
                 new SeparatorMenuItem(),
                 /* Full Screen placeholder */
                 new FullScreenAction(stage));
-        // Update Full screen action when shown to get correct enter/exit FS mode
-        menu.setOnShowing(event ->
-        {   // Last menu item
-            final int full_screen_index = menu.getItems().size() - 1;
-            final FullScreenAction full_screen = new FullScreenAction(stage);
-            if (!AuthorizationService.hasAuthorization("full_screen"))
-                full_screen.setDisable(true);
-            menu.getItems().set(full_screen_index, full_screen);
-        });
+
         menuBar.getMenus().add(menu);
 
         // Help
@@ -580,6 +572,13 @@ private MenuBar createMenu(final Stage stage) {
             menuItems.sort(Comparator.comparing(MenuItem::getText));
             selectTabMenu.getItems().clear();
             selectTabMenu.getItems().addAll(menuItems);
+
+            // Update Full screen action when shown to get correct enter/exit FS mode
+            final int full_screen_index = menu.getItems().size() - 1;
+            final FullScreenAction full_screen = new FullScreenAction(stage);
+            if (!AuthorizationService.hasAuthorization("full_screen"))
+                full_screen.setDisable(true);
+            menu.getItems().set(full_screen_index, full_screen);
         });
 
         closeAllTabsMenuItem.setOnAction(ae -> closeAllTabs());