Merge pull request #2768 from ControlSystemStudio/CSSTUDIO-1995-bugfix

CSSTUDIO-1995 Bugfix: Clicking on a clickable Symbol Widget with mouse buttons other than the primary mouse button should not run the specified actions
ControlSystemStudio · Aug 17, 2023 · 14e3644 · 14e3644
2 parents e6e7b0f + f1f6286
commit 14e3644
Showing 1 changed file with 36 additions and 10 deletions.
diff --git a/...java/org/csstudio/display/builder/representation/javafx/widgets/SymbolRepresentation.java b/...java/org/csstudio/display/builder/representation/javafx/widgets/SymbolRepresentation.java
@@ -27,6 +27,7 @@
 import javafx.scene.effect.DropShadow;
 import javafx.scene.input.KeyCode;
 import javafx.scene.input.KeyEvent;
+import javafx.scene.input.MouseButton;
 import javafx.scene.input.MouseEvent;
 import org.csstudio.display.builder.model.ArrayWidgetProperty;
 import org.csstudio.display.builder.model.DirtyFlag;
@@ -495,34 +496,47 @@ private void enableRunActionsOnMouseClick() {
         ColorAdjust increaseBrightness = new ColorAdjust(0, 0, 0.3, 0);
         ColorAdjust decreaseBrightness = new ColorAdjust(0, 0, -0.3, 0);
 
+        boolean[] buttonIsClicked = { false }; // Value is wrapped in an array as a workaround of the fact that Java doesn't allow non-final variables to be captured by closures.
+
         imageView.addEventFilter(MouseEvent.MOUSE_ENTERED, mouseEvent -> {
-            clickEffect[0] = increaseBrightness;
+            if (!buttonIsClicked[0]) {
+                clickEffect[0] = increaseBrightness;
+            }
+            else {
+                clickEffect[0] = decreaseBrightness;
+            }
             setEffect.run();
             mouseEvent.consume();
         });
 
         imageView.addEventFilter(MouseEvent.MOUSE_EXITED, mouseEvent -> {
             clickEffect[0] = null;
             setEffect.run();
-            mouseEvent.consume();
         });
 
         imageView.addEventFilter(MouseEvent.MOUSE_PRESSED, mouseEvent -> {
-            clickEffect[0] = decreaseBrightness;
+            if (mouseEvent.isPrimaryButtonDown()) {
+                buttonIsClicked[0] = true;
+                clickEffect[0] = decreaseBrightness;
+                mouseEvent.consume();
+            }
+
             setEffect.run();
-            mouseEvent.consume();
         });
 
         imageView.addEventFilter(MouseEvent.MOUSE_RELEASED, mouseEvent -> {
-            clickEffect[0] = increaseBrightness;
-            setEffect.run();
-            mouseEvent.consume();
+            buttonIsClicked[0] = false;
         });
 
         imageView.addEventFilter(MouseEvent.MOUSE_CLICKED, mouseEvent -> {
-            runActions.run();
+            if (mouseEvent.getButton() == MouseButton.PRIMARY) {
+                runActions.run();
+                clickEffect[0] = null;
+                setEffect.run();
+                mouseEvent.consume();
+            }
+
             imageView.requestFocus();
-            mouseEvent.consume();
         });
 
         Color focusColor = Color.web("rgba(3,158,211,1)");
@@ -542,17 +556,29 @@ private void enableRunActionsOnMouseClick() {
             if (keyEvent.getCode() == KeyCode.ENTER || keyEvent.getCode() == KeyCode.SPACE) {
                 clickEffect[0] = decreaseBrightness;
                 setEffect.run();
+
+                buttonIsClicked[0] = true;
+
                 keyEvent.consume();
             }
+            else if (keyEvent.getCode() == KeyCode.TAB) {
+                clickEffect[0] = null;
+                focusEffect[0] = null;
+                setEffect.run();
+
+                buttonIsClicked[0] = false;
+            }
         });
 
         imageView.addEventFilter(KeyEvent.KEY_RELEASED, keyEvent -> {
             if (keyEvent.getCode() == KeyCode.ENTER || keyEvent.getCode() == KeyCode.SPACE) {
-
                 runActions.run();
 
                 clickEffect[0] = null;
                 setEffect.run();
+
+                buttonIsClicked[0] = false;
+
                 keyEvent.consume();
             }
         });