Ticket #850: minimap_ticket850.patch

gui/CGUI.cpp

@@ -132 +132 @@
         // TODO Gee: Optimizations needed!
         //  these two recursive function are quite overhead heavy.
 
-        // pNearest will after this point at the hovered object, possibly NULL
-        pNearest = FindObjectUnderMouse();
+        // If no object is currently capturing the mouse, pNearest will point at the topmost hovered object, possibly NULL.
+        if (m_MouseCapturingObject == NULL)
+            pNearest = FindObjectUnderMouse();
+        else
+            pNearest = m_MouseCapturingObject;
 
         // Is placed in the UpdateMouseOver function
         //if (ev->ev.type == SDL_MOUSEMOTION && pNearest)
@@ -157 +160 @@
 
                 if (pNearest)
                 {
+                    // Should this GUIObject capture all mouse-input until the left mouse-button is released again?
+                    if(pNearest->DoesCaptureMouse())
+                        m_MouseCapturingObject = pNearest;
+
                     ret = pNearest->SendEvent(GUIM_MOUSE_PRESS_LEFT, "mouseleftpress");
                 }
                 break;
@@ -206 +213 @@
                     {
                         ret = pNearest->SendEvent(GUIM_MOUSE_RELEASE_LEFT, "mouseleftrelease");
                     }
+                    // Stop capturing 
+                    m_MouseCapturingObject = NULL;
                 }
                 break;
             case SDL_BUTTON_RIGHT:
@@ -382 +391 @@
     NULL, NULL, NULL, NULL
 };
 
-CGUI::CGUI() : m_MouseButtons(0), m_FocusedObject(NULL), m_InternalNameNumber(0)
+CGUI::CGUI() : m_MouseButtons(0), m_FocusedObject(NULL), m_MouseCapturingObject(NULL), m_InternalNameNumber(0)
 {
     m_BaseObject = new CGUIDummyObject;
     m_BaseObject->SetGUI(this);

gui/IGUIObject.h

@@ -405 +405 @@
      */
     void SetFocus();
 
+    bool DoesCaptureMouse() { return m_CaptureMouseAfterLMBClick; }
+
 protected:
     /**
      * Check if object is focused.
@@ -549 +551 @@
 
     // Is mouse hovering the object? used with the function MouseOver()
     bool                                    m_MouseHovering;
+    
+    // Still receive mouse input after click-dragging the cursor out of the GUIObject until
+    // LMB is released?
+    bool m_CaptureMouseAfterLMBClick;
 
     /**
      * Settings pool, all an object's settings are located here

gui/IGUIObject.cpp

@@ -44 +44 @@
     m_pGUI(NULL), 
     m_pParent(NULL),
     m_MouseHovering(false),
-    m_JSObject(NULL)
+    m_JSObject(NULL),
+    m_CaptureMouseAfterLMBClick(false)
 {
     AddSetting(GUIST_bool,          "enabled");
     AddSetting(GUIST_bool,          "hidden");

gui/MiniMap.cpp

@@ -60 +60 @@
     AddSetting(GUIST_CStr,      "tooltip_style");
     m_Clicking = false;
     m_Hovering = false;
+    m_CaptureMouseAfterLMBClick = true;
 }
 
 CMiniMap::~CMiniMap()
@@ -105 +106 @@
         }
     case GUIM_MOUSE_LEAVE:
         {
-            m_Clicking = false;
             m_Hovering = false;
             break;
         }

gui/CGUI.h

@@ -629 +629 @@
      */
     IGUIObject* m_FocusedObject;
 
+    /**
+     * Object that captures all mouse input.
+     * This is currently only needed for the minimap.
+     */
+    IGUIObject* m_MouseCapturingObject;
+
     /** 
      * Just pointers for fast name access, each object
      * is really constructed within its parent for easy