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

Fix pinned windows showing in other GUI modes

Browse source
This commit is contained in:
scrawl 2017-09-23 14:42:25 +02:00
parent 65a707348c
commit 9ead331741
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -613,6 +613,8 @@ namespace MWGui
setSpellVisibility((mAllowed & GW_Magic) && (!mSpellWindow->pinned() || (mForceHidden & GW_Magic))); setSpellVisibility((mAllowed & GW_Magic) && (!mSpellWindow->pinned() || (mForceHidden & GW_Magic)));
setHMSVisibility((mAllowed & GW_Stats) && (!mStatsWindow->pinned() || (mForceHidden & GW_Stats))); setHMSVisibility((mAllowed & GW_Stats) && (!mStatsWindow->pinned() || (mForceHidden & GW_Stats)));
mInventoryWindow->setGuiMode(getMode());
// If in game mode (or interactive messagebox), show the pinned windows // If in game mode (or interactive messagebox), show the pinned windows
if (mGuiModes.empty()) if (mGuiModes.empty())
{ {
@ -622,11 +624,17 @@ namespace MWGui
mSpellWindow->setVisible(mSpellWindow->pinned() && !(mForceHidden & GW_Magic) && (mAllowed & GW_Magic)); mSpellWindow->setVisible(mSpellWindow->pinned() && !(mForceHidden & GW_Magic) && (mAllowed & GW_Magic));
return; return;
} }
else if (getMode() != GM_Inventory)
{
mMap->setVisible(false);
mStatsWindow->setVisible(false);
mSpellWindow->setVisible(false);
mInventoryWindow->setVisible(getMode() == GM_Container || getMode() == GM_Barter);
}
GuiMode mode = mGuiModes.back(); GuiMode mode = mGuiModes.back();
mInventoryWindow->setTrading(mode == GM_Barter); mInventoryWindow->setTrading(mode == GM_Barter);
mInventoryWindow->setGuiMode(mode);
// For the inventory mode, compute the effective set of windows to show. // For the inventory mode, compute the effective set of windows to show.
// This is controlled both by what windows the // This is controlled both by what windows the