krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

Fix pinned windows hiding

Browse source 
They were always displayed in console mode and in game (even if they
were force hidden).
This commit is contained in:
Emanuel Guevel 2013-08-12 10:39:10 +02:00
parent 1ad02d68a7
commit c27c33f542
1 changed files with 8 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
apps/openmw/mwgui/windowmanagerimp.cpp
View file

@ -372,11 +372,11 @@ namespace MWGui
// If in game mode, show only the pinned windows // If in game mode, show only the pinned windows
if (gameMode) if (gameMode)
{ {
mMap->setVisible(mMap->pinned());
mStatsWindow->setVisible(mStatsWindow->pinned());
mInventoryWindow->setGuiMode(GM_None); mInventoryWindow->setGuiMode(GM_None);
mInventoryWindow->setVisible(mInventoryWindow->pinned()); mMap->setVisible(mMap->pinned() && !(mForceHidden & GW_Map));
mSpellWindow->setVisible(mSpellWindow->pinned()); mStatsWindow->setVisible(mStatsWindow->pinned() && !(mForceHidden & GW_Stats));
mInventoryWindow->setVisible(mInventoryWindow->pinned() && !(mForceHidden & GW_Inventory));
mSpellWindow->setVisible(mSpellWindow->pinned() && !(mForceHidden & GW_Magic));
return; return;
} }
@ -394,11 +394,6 @@ namespace MWGui
mSettingsWindow->setVisible(true); mSettingsWindow->setVisible(true);
break; break;
case GM_Console: case GM_Console:
// Show the pinned windows
mMap->setVisible(mMap->pinned());
mStatsWindow->setVisible(mStatsWindow->pinned());
mInventoryWindow->setVisible(mInventoryWindow->pinned());
mSpellWindow->setVisible(mSpellWindow->pinned());
mConsole->setVisible(true); mConsole->setVisible(true);
break; break;
@ -496,10 +491,10 @@ namespace MWGui
break; break;
case GM_Loading: case GM_Loading:
// Show the pinned windows // Show the pinned windows
mMap->setVisible(mMap->pinned()); mMap->setVisible(mMap->pinned() && !(mForceHidden & GW_Map));
mStatsWindow->setVisible(mStatsWindow->pinned()); mStatsWindow->setVisible(mStatsWindow->pinned() && !(mForceHidden & GW_Stats));
mInventoryWindow->setVisible(mInventoryWindow->pinned()); mInventoryWindow->setVisible(mInventoryWindow->pinned() && !(mForceHidden & GW_Inventory));
mSpellWindow->setVisible(mSpellWindow->pinned()); mSpellWindow->setVisible(mSpellWindow->pinned() && !(mForceHidden & GW_Magic));
setCursorVisible(false); setCursorVisible(false);
break; break;