ignoring events from right mouse button (AIR) (closes #26)

Gamua · Dec 16, 2011 · 95ea71b · 95ea71b
1 parent 8e091e1
commit 95ea71b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/starling/src/starling/core/Starling.as b/starling/src/starling/core/Starling.as
@@ -118,6 +118,7 @@ package starling.core
         private var mEnableErrorChecking:Boolean;
         private var mLastFrameTimestamp:Number;
         private var mViewPort:Rectangle;
+        private var mLeftMouseDown:Boolean;
 
         private var mNativeStage:flash.display.Stage;
         private var mNativeOverlay:flash.display.Sprite;
@@ -348,6 +349,12 @@ package starling.core
                 position = convertPosition(mouseEvent.stageX, mouseEvent.stageY);
                 phase = getPhaseFromMouseEvent(mouseEvent);
                 touchID = 0;
+
+                // MouseEvent.buttonDown returns true for both left and right button (AIR supports
+                // the right mouse button). We only want to react on the left button for now,
+                // so we have to save the state for the left button manually.
+                if (event.type == MouseEvent.MOUSE_DOWN)    mLeftMouseDown = true;
+                else if (event.type == MouseEvent.MOUSE_UP) mLeftMouseDown = false;
             }
             else
             {
@@ -373,7 +380,7 @@ package starling.core
                     case MouseEvent.MOUSE_DOWN: return TouchPhase.BEGAN; break;
                     case MouseEvent.MOUSE_UP:   return TouchPhase.ENDED; break;
                     case MouseEvent.MOUSE_MOVE: 
-                        return mouseEvent.buttonDown ? TouchPhase.MOVED : TouchPhase.HOVER; 
+                        return mLeftMouseDown ? TouchPhase.MOVED : TouchPhase.HOVER; 
                         break;
                     default: return null;
                 }

diff --git a/starling/src/starling/events/TouchProcessor.as b/starling/src/starling/events/TouchProcessor.as
@@ -172,7 +172,7 @@ package starling.events
 
         private function onKey(event:KeyboardEvent):void
         {
-            if (event.keyCode == 17) // ctrl key
+            if (event.keyCode == 17 || event.keyCode == 15) // ctrl or cmd key
             {
                 var wasCtrlDown:Boolean = mCtrlDown;
                 mCtrlDown = event.type == KeyboardEvent.KEY_DOWN;