Changeset 7874

Timestamp:

Feb 13, 2011, 1:25:46 AM (13 years ago)

Author:

landauf

Message:

WindowEventListener now declares if the window's focus is active or not.
CEGUI stops highlighting menu items if the window's focus is lost, i.e. after pressing alt+tab

Location:

code/trunk/src/libraries/core

Files:

• GUIManager.cc (modified) (2 diffs)
• GUIManager.h (modified) (1 diff)
• GraphicsManager.cc (modified) (1 diff)
• WindowEventListener.cc (modified) (1 diff)
• WindowEventListener.h (modified) (1 diff)
• input/InputManager.cc (modified) (1 diff)
• input/InputManager.h (modified) (1 diff)

code/trunk/src/libraries/core/GUIManager.cc

@@ -393 +393 @@
 
     /**
+        @brief Indicates that the mouse left the application's window.
+    */
+    void GUIManager::mouseLeft()
+    {
+        this->protectedCall(boost::bind(&CEGUI::System::injectMouseLeaves, _1));
+    }
+
+    /**
     @brief
         converts mouse event code to CEGUI event code
@@ -505 +513 @@
         this->guiRenderer_->setDisplaySize(CEGUI::Size(newWidth, newHeight));
     }
+
+    /**
+        @brief Notify CEGUI if the windows loses the focus (stops higlight of menu items, etc).
+    */
+    void GUIManager::windowFocusChanged(bool bFocus)
+    {
+        if (!bFocus)
+            this->mouseLeft();
+    }
 }

code/trunk/src/libraries/core/GUIManager.h

@@ -132 +132 @@
         void mouseMoved    (IntVector2 abs, IntVector2 rel, IntVector2 clippingSize);
         void mouseScrolled (int abs, int rel);
+        void mouseLeft     ();
 
         // window event handler
         virtual void windowResized(unsigned int newWidth, unsigned int newHeight);
+        virtual void windowFocusChanged(bool bFocus);
 
         scoped_ptr<CEGUI::OgreCEGUIRenderer> guiRenderer_;      //!< CEGUI's interface to the Ogre Engine

code/trunk/src/libraries/core/GraphicsManager.cc

@@ -75 +75 @@
             { orxonox::WindowEventListener::resizeWindow(rw->getWidth(), rw->getHeight()); }
         void windowFocusChange (Ogre::RenderWindow* rw)
-            { orxonox::WindowEventListener::changeWindowFocus(); }
+            { orxonox::WindowEventListener::changeWindowFocus(rw->isActive()); }
         void windowClosed      (Ogre::RenderWindow* rw)
             { orxonox::Game::getInstance().stop(); }

code/trunk/src/libraries/core/WindowEventListener.cc

@@ -57 +57 @@
 
     //! Calls all registered objects
-    /*static*/ void WindowEventListener::changeWindowFocus()
+    /*static*/ void WindowEventListener::changeWindowFocus(bool bFocus)
     {
         for (ObjectList<WindowEventListener>::iterator it = ObjectList<WindowEventListener>::begin(); it; ++it)
-            it->windowFocusChanged();
+            it->windowFocusChanged(bFocus);
     }
 }

code/trunk/src/libraries/core/WindowEventListener.h

@@ -62 +62 @@
 
             //! Window has lost/gained focus
-            virtual void windowFocusChanged() { }
+            virtual void windowFocusChanged(bool bFocus) { }
 
             static void moveWindow();
             static void resizeWindow(unsigned int newWidth, unsigned int newHeight);
-            static void changeWindowFocus();
+            static void changeWindowFocus(bool bFocus);
 
             //! Static variable that holds the latest distributed information

code/trunk/src/libraries/core/input/InputManager.cc

@@ -496 +496 @@
 
     //! Gets called by WindowEventListener upon focus change --> clear buffers
-    void InputManager::windowFocusChanged()
+    void InputManager::windowFocusChanged(bool bFocus)
     {
         this->clearBuffers();

code/trunk/src/libraries/core/input/InputManager.h

@@ -202 +202 @@
 
         // From WindowEventListener
-        void windowFocusChanged();
+        void windowFocusChanged(bool bFocus);
 
     private: // variables