Pass KeyEvent that caused accelerator event to fire in the accelerato…

…r event.
MyWorldLLC · Feb 13, 2024 · 6709504 · 6709504
1 parent 79c7baa
commit 6709504
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/Obsidian/src/main/java/myworld/obsidian/events/input/AcceleratorEvent.java b/Obsidian/src/main/java/myworld/obsidian/events/input/AcceleratorEvent.java
@@ -5,13 +5,19 @@
 
 public class AcceleratorEvent extends InputEvent {
 
+    protected final KeyEvent cause;
     protected final Key[] keys;
 
-    public AcceleratorEvent(InputManager manager, Key[] keys){
+    public AcceleratorEvent(InputManager manager, KeyEvent cause, Key[] keys){
         super(manager);
+        this.cause = cause;
         this.keys = keys;
     }
 
+    public KeyEvent getCause(){
+        return cause;
+    }
+
     public Key[] getKeys(){
         return keys;
     }

diff --git a/Obsidian/src/main/java/myworld/obsidian/input/InputManager.java b/Obsidian/src/main/java/myworld/obsidian/input/InputManager.java
@@ -183,7 +183,7 @@ public ValueProperty<Consumer<Throwable>> uncaughtThrowableHandler(){
 
     public void addAccelerator(Consumer<AcceleratorEvent> listener, Key... keys){
         Consumer<KeyEvent> handler = (evt) -> {
-            listener.accept(new AcceleratorEvent(evt.getManager(), keys));
+            listener.accept(new AcceleratorEvent(evt.getManager(), evt, keys));
         };
         accelerators.add(new Accelerator(keys, handler));
         dispatcher.subscribe(KeyEvent.class, EventFilters.accelerator(keys), handler);