[Orxonox-commit 3354] r8042 - code/branches/mac_osx/src/libraries/core

rgrieder at orxonox.net rgrieder at orxonox.net
Mon Mar 7 19:15:02 CET 2011


Author: rgrieder
Date: 2011-03-07 19:15:02 +0100 (Mon, 07 Mar 2011)
New Revision: 8042

Modified:
   code/branches/mac_osx/src/libraries/core/GUIManager.cc
Log:
There is no non exclusive/grab mode for the mouse on Mac OS X --> always show the CEGUI cursor.

Modified: code/branches/mac_osx/src/libraries/core/GUIManager.cc
===================================================================
--- code/branches/mac_osx/src/libraries/core/GUIManager.cc	2011-03-07 08:58:46 UTC (rev 8041)
+++ code/branches/mac_osx/src/libraries/core/GUIManager.cc	2011-03-07 18:15:02 UTC (rev 8042)
@@ -277,12 +277,18 @@
         ----------------------------------------------------
         false                     | False | True  | Dontcare
         */
+
+#ifdef ORXONOX_PLATFORM_APPLE
+        // There is no non exclusive mode on OS X yet
+        state->setMouseExclusive(TriBool::True);
+#else
         if (showCursor == TriBool::Dontcare)
             state->setMouseExclusive(TriBool::Dontcare);
         else if (GraphicsManager::getInstance().isFullScreen() || showCursor == TriBool::False)
             state->setMouseExclusive(TriBool::True);
         else
             state->setMouseExclusive(TriBool::False);
+#endif
 
         if (showCursor == TriBool::True)
             state->setMouseHandler(this);




More information about the Orxonox-commit mailing list