Changeset 6036

Timestamp:

Nov 5, 2009, 9:46:27 AM (14 years ago)

Author:

scheusso

Message:

some changes to make GUI showing/hiding with possible coverage of current shown GUIs now possible

Location:

code/branches/menu

Files:

• data/gui/scripts/InitialiseGUI.lua (modified) (1 diff)
• src/libraries/core/GUIManager.cc (modified) (3 diffs)

code/branches/menu/data/gui/scripts/InitialiseGUI.lua

@@ -61 +61 @@
     end
 
-    debug("test")
-    debug(currentGUI.window:getName())
-    debug(root:isChild(currentGUI.window))
     if(root:isChild(currentGUI.window)) then
-        debug("removing window")
         root:removeChildWindow(currentGUI.window)
     end

code/branches/menu/src/libraries/core/GUIManager.cc

@@ -213 +213 @@
     {
         std::pair<std::set<std::string>::iterator,bool> result = GUIManager::getInstance().showingGUIs_.insert(name);
-        if(result.second == false) //!< GUI already showing.
-            return;
         if(GUIManager::getInstance().showingGUIs_.size() == 1 && result.second == true) //!< If it's the first GUI.
         {
-//             GUIManager::getInstance().executeCode("showCursor()");
             InputManager::getInstance().enterState("guiMouseOnly");
         }
-        COUT(0) << "showGUI" << endl;
         GUIManager::getInstance().executeCode("showGUI(\"" + name + "\", " + multi_cast<std::string>(hidePrevious) + ", " + multi_cast<std::string>(showCursor) + ")");
     }
@@ -231 +227 @@
     {
         std::pair<std::set<std::string>::iterator,bool> result = this->showingGUIs_.insert(name);
-        if(result.second == false) //!< GUI already showing.
-            return;
         if(this->showingGUIs_.size() == 1 && result.second == true) //!< If it's the first GUI.
         {
@@ -249 +243 @@
     /*static*/ void GUIManager::hideGUI(const std::string& name)
     {
-        bool present = GUIManager::getInstance().showingGUIs_.erase(name);
-        if(!present) //!< If there was nothing to erase.
-            return;
+        GUIManager::getInstance().showingGUIs_.erase(name);
         GUIManager::getInstance().executeCode("hideGUI(\"" + name + "\")");
         if(GUIManager::getInstance().showingGUIs_.size() == 0)