From d0543664602cde181979a45494fc64f0f84158d8 Mon Sep 17 00:00:00 2001
From: Emanuel Guevel <guevel.emanuel@gmail.com>
Date: Mon, 5 Aug 2013 23:15:26 +0200
Subject: [PATCH] Permit to force hiding GUI windows

---
 apps/openmw/mwbase/windowmanager.hpp   |  3 +++
 apps/openmw/mwgui/windowmanagerimp.cpp | 17 +++++++++++++++--
 apps/openmw/mwgui/windowmanagerimp.hpp |  4 ++++
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwbase/windowmanager.hpp b/apps/openmw/mwbase/windowmanager.hpp
index 81ef9ee79..54173ff1b 100644
--- a/apps/openmw/mwbase/windowmanager.hpp
+++ b/apps/openmw/mwbase/windowmanager.hpp
@@ -105,6 +105,9 @@ namespace MWBase
 
             virtual void toggleVisible (MWGui::GuiWindow wnd) = 0;
 
+            virtual void forceHide(MWGui::GuiWindow wnd) = 0;
+            virtual void unsetForceHide(MWGui::GuiWindow wnd) = 0;
+
             /// Disallow all inventory mode windows
             virtual void disallowAll() = 0;
 
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index 792431038..551f7ad51 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -105,6 +105,7 @@ namespace MWGui
       , mGui(NULL)
       , mGarbageDialogs()
       , mShown(GW_ALL)
+      , mForceHidden(GW_None)
       , mAllowed(GW_ALL)
       , mRestAllowed(true)
       , mShowFPSLevel(fpsLevel)
@@ -435,7 +436,7 @@ namespace MWGui
                 // This is controlled both by what windows the
                 // user has opened/closed (the 'shown' variable) and by what
                 // windows we are allowed to show (the 'allowed' var.)
-                int eff = mShown & mAllowed;
+                int eff = mShown & mAllowed & ~mForceHidden;
 
                 // Show the windows we want
                 mMap            ->setVisible(eff & GW_Map);
@@ -1117,7 +1118,19 @@ namespace MWGui
 
     void WindowManager::toggleVisible (GuiWindow wnd)
     {
-        mShown = (mShown & wnd) ? (GuiWindow) (mShown & ~wnd) : (GuiWindow) (mShown | wnd);
+        mShown = (GuiWindow)(mShown ^ wnd);
+        updateVisible();
+    }
+
+    void WindowManager::forceHide(GuiWindow wnd)
+    {
+        mForceHidden = (GuiWindow)(mForceHidden | wnd);
+        updateVisible();
+    }
+
+    void WindowManager::unsetForceHide(GuiWindow wnd)
+    {
+        mForceHidden = (GuiWindow)(mForceHidden & ~wnd);
         updateVisible();
     }
 
diff --git a/apps/openmw/mwgui/windowmanagerimp.hpp b/apps/openmw/mwgui/windowmanagerimp.hpp
index a178dc621..6adf19333 100644
--- a/apps/openmw/mwgui/windowmanagerimp.hpp
+++ b/apps/openmw/mwgui/windowmanagerimp.hpp
@@ -115,6 +115,9 @@ namespace MWGui
 
     virtual void toggleVisible(GuiWindow wnd);
 
+    virtual void forceHide(MWGui::GuiWindow wnd);
+    virtual void unsetForceHide(MWGui::GuiWindow wnd);
+
     // Disallow all inventory mode windows
     virtual void disallowAll();
 
@@ -334,6 +337,7 @@ namespace MWGui
     void cleanupGarbage();
 
     GuiWindow mShown; // Currently shown windows in inventory mode
+    GuiWindow mForceHidden; // Hidden windows (overrides mShown)
 
     /* Currently ALLOWED windows in inventory mode. This is used at
        the start of the game, when windows are enabled one by one