Changeset 1133 for trunk/src/org/apollo

Timestamp:

09/14/18 13:26:33 (6 years ago)

Author:

bln4

Message:

org.apollo.ApolloKBMGestureTranslator ->

Additional guard on Apollo translator for CTRL + L to match pre JFX refactoring. Expeditee's base CTRL + L now gets an opportunity to run.

File:

• trunk/src/org/apollo/ApolloKBMGestureTranslator.java (modified) (2 diffs)

trunk/src/org/apollo/ApolloKBMGestureTranslator.java

@@ -12 +12 @@
 import org.expeditee.gio.gesture.data.RefreshGestureData;
 import org.expeditee.gio.input.InputEvent;
+import org.expeditee.gio.input.InputEvent.InputType;
 import org.expeditee.gio.input.InputEventToGestureTranslator;
 import org.expeditee.gio.input.InputEventToGestureTranslatorSet;
 import org.expeditee.gio.input.KBMInputEvent;
-import org.expeditee.gio.input.InputEvent.InputType;
 import org.expeditee.gio.input.KBMInputEvent.Key;
 import org.expeditee.gio.input.KBMInputEvent.MouseButton;
+import org.expeditee.gui.FrameUtils;
 import org.expeditee.gio.input.StandardInputEventListeners;
 
@@ -134 +135 @@
                                 if (!StandardInputEventListeners.kbmStateListener.isKeyDown(Key.CTRL)) return null;
                                 
+                                // Check that no Items are selected (Apollo uses widgets)
+                                if(FrameUtils.getCurrentItem() != null) return null;
+                                
                                 // Check that L was pressed
                                 if (kbmEvent.getKeyDown() != Key.L) return null;