New cvar ui_hide_gui tracking the U hotkey

This is for scripts to monitor and reflect. Note that currently only the dashboard overlay and top state-notification boxes respect this setting, not windows in general.
ohlidalp · Oct 1, 2023 · 91a1e14 · 91a1e14
1 parent ca95d12
commit 91a1e14
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/source/main/Application.cpp b/source/main/Application.cpp
@@ -256,6 +256,7 @@ CVar* flexbody_defrag_invert_lookup;
 // GUI
 CVar* ui_show_live_repair_controls;
 CVar* ui_preset;
+CVar* ui_hide_gui;
 
 // Instance management
 void SetCacheSystem    (CacheSystem* obj)             { g_cache_system = obj; }

diff --git a/source/main/Application.h b/source/main/Application.h
@@ -472,6 +472,7 @@ extern CVar* flexbody_defrag_invert_lookup;
 // GUI
 extern CVar* ui_show_live_repair_controls; //!< bool
 extern CVar* ui_preset; //!< enum `RoR::UiPreset`
+extern CVar* ui_hide_gui; //!< bool; The 'hide GUI' hotkey state
 
 // ------------------------------------------------------------------------------------------------
 // Global objects

diff --git a/source/main/gui/GUIManager.cpp b/source/main/gui/GUIManager.cpp
@@ -199,7 +199,7 @@ void GUIManager::DrawSimGuiBuffered(GfxActor* player_gfx_actor)
 
     if (!this->ConsoleWindow.IsVisible())
     {
-        if (!m_hide_gui)
+        if (!App::ui_hide_gui->getBool())
         {
             this->ChatBox.Draw(); // Messages must be always visible
         }
@@ -287,7 +287,7 @@ void GUIManager::SetSceneManagerForGuiRendering(Ogre::SceneManager* scene_manage
 
 void GUIManager::SetGuiHidden(bool hidden)
 {
-    m_hide_gui = hidden;
+    App::ui_hide_gui->setVal(hidden);
     App::GetOverlayWrapper()->showDashboardOverlays(!hidden, App::GetGameContext()->GetPlayerActor());
     if (hidden)
     {
@@ -399,7 +399,7 @@ void GUIManager::SetupImGui()
 
 void GUIManager::DrawCommonGui()
 {
-    if (App::mp_state->getEnum<MpState>() == MpState::CONNECTED && !m_hide_gui)
+    if (App::mp_state->getEnum<MpState>() == MpState::CONNECTED && !App::ui_hide_gui->getBool())
     {
         this->MpClientList.Draw();
     }

diff --git a/source/main/gui/GUIManager.h b/source/main/gui/GUIManager.h
@@ -155,7 +155,7 @@ class GUIManager
     void DrawCommonGui();
 
     void SetGuiHidden(bool visible);
-    bool IsGuiHidden() const { return m_hide_gui; }
+    bool IsGuiHidden() const { return App::ui_hide_gui->getBool(); }
 
     void SetSceneManagerForGuiRendering(Ogre::SceneManager* scene_manager);
 
@@ -180,7 +180,6 @@ class GUIManager
 
     MyGUI::Gui*          m_mygui                    = nullptr;
     MyGUI::OgrePlatform* m_mygui_platform           = nullptr;
-    bool                 m_hide_gui                 = false;
     OgreImGui            m_imgui;
     GuiTheme             m_theme;
     bool                 m_gui_kb_capture_queued    = false; //!< Resets and accumulates every frame

diff --git a/source/main/system/CVar.cpp b/source/main/system/CVar.cpp
@@ -195,6 +195,7 @@ void Console::cVarSetupBuiltins()
 
     App::ui_show_live_repair_controls      = this->cVarCreate("ui_show_live_repair_controls",      "", CVAR_ARCHIVE | CVAR_TYPE_BOOL, "true");
     App::ui_preset                         = this->cVarCreate("ui_preset",                         "", CVAR_ARCHIVE | CVAR_TYPE_INT, "0"/*(int)UiPreset::NOVICE*/);
+    App::ui_hide_gui                       = this->cVarCreate("ui_hide_gui",                       "", CVAR_TYPE_BOOL, "false");
 }
 
 CVar* Console::cVarCreate(std::string const& name, std::string const& long_name,