fix(framework): Fix logic for reflection sidecar

fujaba · May 24, 2024 · 02db570 · 02db570
1 parent ee0471d
commit 02db570
Showing 1 changed file with 11 additions and 10 deletions.
diff --git a/framework/src/main/java/org/fulib/fx/controller/internal/ReflectionSidecar.java b/framework/src/main/java/org/fulib/fx/controller/internal/ReflectionSidecar.java
@@ -456,16 +456,17 @@ private EventHandler<KeyEvent> createKeyEventHandler(Method method, Object insta
         };
     }
 
-    private boolean keyEventMatchesAnnotation(KeyEvent event, OnKey annotation) {
-        return (annotation.code() == KeyCode.UNDEFINED || event.getCode() == annotation.code()) &&
-            (annotation.character().isEmpty() || event.getCharacter().equals(annotation.character())) &&
-            (annotation.text().isEmpty() || event.getText().equals(annotation.text())) &&
-
-            // key pressed ==> not strict || key required
-            (event.isShiftDown() && (!annotation.strict() || annotation.shift())) &&
-            (event.isControlDown() && (!annotation.strict() || annotation.control())) &&
-            (event.isAltDown() && (!annotation.strict() || annotation.alt())) &&
-            (event.isMetaDown() && (!annotation.strict() || annotation.meta()));
+    private boolean keyEventMatchesAnnotation(KeyEvent event, OnKey onKey) {
+        return (onKey.code() == KeyCode.UNDEFINED || event.getCode() == onKey.code()) &&
+            (onKey.character().isEmpty() || event.getCharacter().equals(onKey.character())) &&
+            (onKey.text().isEmpty() || event.getText().equals(onKey.text())) &&
+
+            // key required and key pressed || key not required and (not strict or strict and not pressed)
+            // If strict is enabled, the key must not be pressed
+            (onKey.shift() && event.isShiftDown()) || (!onKey.shift() && (!onKey.strict() || !event.isShiftDown())) &&
+            (onKey.control() && event.isControlDown()) || (!onKey.control() && (!onKey.strict() || !event.isControlDown())) &&
+            (onKey.alt() && event.isAltDown()) || (!onKey.alt() && (!onKey.strict() || !event.isAltDown())) &&
+            (onKey.meta() && event.isMetaDown()) || (!onKey.meta() && (!onKey.strict() || !event.isMetaDown()));
     }
 
     @Override