mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-28 21:39:48 +00:00
Code Issues Releases Wiki Activity

Merge branch 'cherry-pick-0dacbaf31a5e0703c49eead6d6a977a28ec299f3' into 'master'

Browse source 
ActionManager::toggleMainMenu() should close PostProcessor HUD

See merge request OpenMW/openmw!2305
This commit is contained in:
psi29a 2022-08-21 20:16:36 +00:00
commit bf0865d03d
4 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwbase/windowmanager.hpp
View file

@ -130,6 +130,8 @@ namespace MWBase
virtual bool isConsoleMode() const = 0; virtual bool isConsoleMode() const = 0;
virtual bool isPostProcessorHudVisible() const = 0;
virtual void toggleVisible (MWGui::GuiWindow wnd) = 0; virtual void toggleVisible (MWGui::GuiWindow wnd) = 0;
virtual void forceHide(MWGui::GuiWindow wnd) = 0; virtual void forceHide(MWGui::GuiWindow wnd) = 0;

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

@ -1509,6 +1509,11 @@ namespace MWGui
return mConsole && mConsole->isVisible(); return mConsole && mConsole->isVisible();
} }
bool WindowManager::isPostProcessorHudVisible() const
{
return mPostProcessorHud->isVisible();
}
MWGui::GuiMode WindowManager::getMode() const MWGui::GuiMode WindowManager::getMode() const
{ {
if (mGuiModes.empty()) if (mGuiModes.empty())

2
apps/openmw/mwgui/windowmanagerimp.hpp
View file

@ -170,6 +170,8 @@ namespace MWGui
bool isConsoleMode() const override; bool isConsoleMode() const override;
bool isPostProcessorHudVisible() const override;
void toggleVisible(GuiWindow wnd) override; void toggleVisible(GuiWindow wnd) override;
void forceHide(MWGui::GuiWindow wnd) override; void forceHide(MWGui::GuiWindow wnd) override;

6
apps/openmw/mwinput/actionmanager.cpp
View file

@ -323,6 +323,12 @@ namespace MWInput
return; return;
} }
if (MWBase::Environment::get().getWindowManager()->isPostProcessorHudVisible())
{
MWBase::Environment::get().getWindowManager()->togglePostProcessorHud();
return;
}
if (!MWBase::Environment::get().getWindowManager()->isGuiMode()) //No open GUIs, open up the MainMenu if (!MWBase::Environment::get().getWindowManager()->isGuiMode()) //No open GUIs, open up the MainMenu
{ {
MWBase::Environment::get().getWindowManager()->pushGuiMode (MWGui::GM_MainMenu); MWBase::Environment::get().getWindowManager()->pushGuiMode (MWGui::GM_MainMenu);