- Timestamp:
- 07/24/19 11:23:45 (5 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/expeditee/gio/gesture/ExpediteeKBMGestureTranslator.java
r1413 r1415 7 7 import org.expeditee.gio.EcosystemManager; 8 8 import org.expeditee.gio.TimeoutQueue.TimeoutHandle; 9 import org.expeditee.gio.gesture.Gesture.GestureType; 9 10 import org.expeditee.gio.gesture.StandardGestureActions.StandardGestureType; 10 11 import org.expeditee.gio.gesture.data.ChangeColourGestureData; … … 100 101 return null; 101 102 } 103 102 104 //System.err.println("ExpediteeKBMGestureTranslator::" + details() + ": " + kbmEvent.getCharTyped()); 103 105 // Generate a INSERT_STRING gesture … … 130 132 addTranslator(new InputEventToGestureTranslator(InputType.KBM) 131 133 { 132 private static final int NO_CONSTRAINT = 0;134 //private static final int NO_CONSTRAINT = 0; 133 135 private SelectAreaGestureData _draggedFromData = null; 134 private int _constrainedDirection = NO_CONSTRAINT;136 //private int _constrainedDirection = NO_CONSTRAINT; 135 137 136 138 @Override … … 210 212 newMousePos.add(1, 1); 211 213 } else*/ { 212 _constrainedDirection = NO_CONSTRAINT;214 //_constrainedDirection = NO_CONSTRAINT; 213 215 newMousePos = kbmEvent.getMouseMove().getSecondEnd().clone(); 214 216 } … … 682 684 683 685 // Add the F10 -> TOGGLE_XRAY_MODE gesture recogniser 684 addTranslator(new InputEventToGestureTranslator(InputType.KBM) 685 {686 addTranslator(new InputEventToGestureTranslator(InputType.KBM) { 687 686 688 @Override 687 689 public String details() { return "F10 -> TOGGLE_XRAY_MODE"; } 688 689 @Override 690 public List<Gesture> onInputEvent(InputEvent event) { 691 // Cast to keyboard/mouse event 692 KBMInputEvent kbmEvent = (KBMInputEvent) event; 693 690 691 @Override 692 public List<Gesture> onInputEvent(InputEvent event) { 693 // Cast to keyboard/mouse event 694 KBMInputEvent kbmEvent = (KBMInputEvent) event; 695 694 696 // Must be pressing F10 to xray mode 695 if (kbmEvent.getKeyDown() != KBMInputEvent.Key.F10) { 696 return null; 697 } 698 699 // Return the gesture 700 if (kbmTranslator.isKeyDown(Key.SHIFT)) { 701 UndoGestureData data = new UndoGestureData(kbmTranslator.isKeyDown(Key.CTRL)); 702 return Gesture.single(StandardGestureActions.getInstance().gestureType(StandardGestureType.TOGGLE_SURROGATE_MODE), data); 703 } else { 704 return Gesture.single(StandardGestureActions.getInstance().gestureType(StandardGestureType.TOGGLE_XRAY_MODE), null); 705 } 697 if (kbmEvent.getKeyDown() != KBMInputEvent.Key.F10 || kbmTranslator.isKeyDown(Key.SHIFT)) { 698 return null; 699 } 700 701 return Gesture.single(StandardGestureActions.getInstance().gestureType(StandardGestureType.TOGGLE_XRAY_MODE), null); 702 } 703 }); 704 705 // Add the F10 -> CYCLE_SURROGATE_MODE gesture recogniser 706 addTranslator(new InputEventToGestureTranslator(InputType.KBM) { 707 @Override 708 public String details() { return "F10 -> CYCLE_SURROGATE_MODE"; } 709 710 @Override 711 public List<Gesture> onInputEvent(InputEvent event) { 712 // Case to keyboard/mouse event 713 KBMInputEvent kbmEvent = (KBMInputEvent) event; 714 715 // Must be pressing F10 to surrogate mode 716 if (kbmEvent.getKeyDown() != KBMInputEvent.Key.F10 || !kbmTranslator.isKeyDown(Key.SHIFT)) { 717 return null; 718 } 719 720 UndoGestureData data = new UndoGestureData(kbmTranslator.isKeyDown(Key.CTRL)); 721 return Gesture.single(StandardGestureActions.getInstance().gestureType(StandardGestureType.CYCLE_SURROGATE_MODE), data); 706 722 } 707 723 }); … … 2190 2206 return Gesture.single(vFormat); 2191 2207 } 2208 } 2209 }); 2210 2211 // Add the ENTER_CHAR_TYPED -> ACTIVATE BUTTON -> FORMAT gesture recogniser 2212 addTranslator(new InputEventToGestureTranslator(InputType.KBM) 2213 { 2214 @Override 2215 public String details() { return "ENTER_CHAR_TYPED -> ACTIVATE BUTTON"; } 2216 2217 @Override 2218 public List<Gesture> onInputEvent(InputEvent event) { 2219 // Cast to keyboard/mouse event 2220 KBMInputEvent kbmEvent = (KBMInputEvent) event; 2221 2222 if (kbmEvent.getKeyDown() != Key.ENTER) { 2223 return null; 2224 } 2225 2226 GestureType gestureType = StandardGestureActions.getInstance().gestureType(StandardGestureType.ACTIVATE_BUTTON); 2227 ItemSpecificGestureData data = new ClickGestureData(false); 2228 return Gesture.single(gestureType, data); 2192 2229 } 2193 2230 });
Note:
See TracChangeset
for help on using the changeset viewer.