Revision: 530 Author: allain.lalonde Date: Mon Jul 20 14:32:09 2009 Log: Added back in check for modifiers applying to input events. Turns out some of the examples expect this behaviour (NavigationExample being one). http://code.google.com/p/piccolo2d/source/detail?r=530
Modified: /piccolo2d.java/trunk/core/src/main/java/edu/umd/cs/piccolo/event/PInputEventFilter.java /piccolo2d.java/trunk/core/src/test/java/edu/umd/cs/piccolo/event/PInputEventFilterTest.java ======================================= --- /piccolo2d.java/trunk/core/src/main/java/edu/umd/cs/piccolo/event/PInputEventFilter.java Fri Jul 17 14:51:54 2009 +++ /piccolo2d.java/trunk/core/src/main/java/edu/umd/cs/piccolo/event/PInputEventFilter.java Mon Jul 20 14:32:09 2009 @@ -104,11 +104,13 @@ if (aEvent.isHandled() && !acceptsAlreadyHandledEvents) return false; - if ((modifiers & andMask) != andMask || (modifiers & notMask) != 0) - return false; - - if (orMask != ALL_MODIFIERS_MASK && (modifiers & orMask) == 0) - return false; + if (modifiers != 0) { + if ((modifiers & andMask) != andMask || (modifiers & notMask) != 0) + return false; + + if (orMask != ALL_MODIFIERS_MASK && (modifiers & orMask) == 0) + return false; + } if (aEvent.isMouseEvent() && clickCount != -1 && clickCount != aEvent.getClickCount()) return false; ======================================= --- /piccolo2d.java/trunk/core/src/test/java/edu/umd/cs/piccolo/event/PInputEventFilterTest.java Fri Jul 17 14:51:54 2009 +++ /piccolo2d.java/trunk/core/src/test/java/edu/umd/cs/piccolo/event/PInputEventFilterTest.java Mon Jul 20 14:32:09 2009 @@ -207,7 +207,7 @@ } private PInputEvent buildTestEvent() { - return buildTestEvent(0); + return buildTestEvent(InputEvent.BUTTON1_MASK); } private PInputEvent buildTestEvent(int modifiers) { --~--~---------~--~----~------------~-------~--~----~ Piccolo2D Developers Group: http://groups.google.com/group/piccolo2d-dev?hl=en -~----------~----~----~----~------~----~------~--~---