Changeset 6412 for code/branches/pickup2/src/libraries/core/input/Keyboard.cc

Timestamp:

Dec 25, 2009, 1:18:03 PM (15 years ago)

Author:

dafrick

Message:

Merged presentation2 branch into pickup2 branch.

Location:

code/branches/pickup2

Files:

• . (modified) (1 prop)
• src/libraries/core/input/Keyboard.cc (modified) (1 diff)

code/branches/pickup2/src/libraries/core/input/Keyboard.cc

@@ -43 +43 @@
             modifiers_ |= KeyboardModifier::Shift; // shift key
 
+        // Do not distribute the alt+tab event (messes with the operating system)
+        if ((modifiers_ & KeyboardModifier::Alt) != 0 && arg.key == OIS::KC_TAB)
+            return true;
+
         KeyEvent evt(arg);
         super::buttonPressed(evt);