CSSTUDIO-1986 Allow selection of widgets in the Widget Tree using the…

… arrow keys when the Widget Tree has the focus.
ControlSystemStudio · Jul 20, 2023 · 58fa25b · 58fa25b
1 parent 785e320
commit 58fa25b
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/...or/src/main/java/org/csstudio/display/builder/editor/tracker/SelectedWidgetUITracker.java b/...or/src/main/java/org/csstudio/display/builder/editor/tracker/SelectedWidgetUITracker.java
@@ -358,6 +358,11 @@ private void closeInlineEditor()
         inline_editor = null;
     }
 
+    private boolean requestFocusIsDisabled = false;
+    public void setDisableRequestFocus(boolean requestFocusIsDisabled) {
+        this.requestFocusIsDisabled = requestFocusIsDisabled;
+    }
+
     /** Locate widgets that would be 'clicked' by a mouse event's location */
     private class ClickWidgets extends RecursiveTask<Boolean>
     {
@@ -635,9 +640,10 @@ public void setSelectedWidgets(final List<Widget> widgets)
 
         bindToWidgets();
 
-        // Get focus to allow use of arrow keys
-        Platform.runLater(() -> tracker.requestFocus());
-
+        if (!requestFocusIsDisabled) {
+            // Get focus to allow use of arrow keys
+            Platform.runLater(() -> tracker.requestFocus());
+        }
     }
 
     @Override

diff --git a/app/display/editor/src/main/java/org/csstudio/display/builder/editor/tree/WidgetTree.java b/app/display/editor/src/main/java/org/csstudio/display/builder/editor/tree/WidgetTree.java
@@ -331,9 +331,11 @@ private void bindSelections()
                         : wot.getTab().getWidget();
                     if (! widgets.contains(widget))
                         widgets.add(widget);
-                };
+                }
                 logger.log(Level.FINE, "Selected in tree: {0}", widgets);
+                editor.getSelectedWidgetUITracker().setDisableRequestFocus(true);
                 editor.getWidgetSelectionHandler().setSelection(widgets);
+                editor.getSelectedWidgetUITracker().setDisableRequestFocus(false);
             }
             finally
             {

diff --git a/core/ui/src/main/java/org/phoebus/ui/javafx/Tracker.java b/core/ui/src/main/java/org/phoebus/ui/javafx/Tracker.java
@@ -179,7 +179,7 @@ void hookEvents()
         // Keep the keyboard focus to actually get key events.
         // The RTImagePlot will also listen to mouse moves and try to keep the focus,
         // so the active tracker uses an event filter to have higher priority
-        tracker.addEventFilter(MouseEvent.MOUSE_MOVED, event ->
+        tracker.addEventFilter(MouseEvent.MOUSE_CLICKED, event ->
         {
             event.consume();
             tracker.requestFocus();