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

Merge branch 'settings_values_hud' into 'master'

Browse source 
Use settings values for HUD settings (#6876)

See merge request OpenMW/openmw!3250
This commit is contained in:
psi29a 2023-07-21 08:36:45 +00:00
commit 4973230b84
2 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -183,7 +183,6 @@ namespace MWGui
, mContainerWindow(nullptr)
, mTranslationDataStorage(translationDataStorage)
, mInputBlocker(nullptr)
, mCrosshairEnabled(Settings::Manager::getBool("crosshair", "HUD"))
, mHudEnabled(true)
, mCursorVisible(true)
, mCursorActive(true)
@ -1148,9 +1147,7 @@ namespace MWGui
bool changeRes = false;
for (const auto& setting : changed)
{
if (setting.first == "HUD" && setting.second == "crosshair")
mCrosshairEnabled = Settings::Manager::getBool("crosshair", "HUD");
else if (setting.first == "GUI" && setting.second == "menu transparency")
if (setting.first == "GUI" && setting.second == "menu transparency")
setMenuTransparency(Settings::gui().mMenuTransparency);
else if (setting.first == "Video"
&& (setting.second == "resolution x" || setting.second == "resolution y"
@ -1580,7 +1577,7 @@ namespace MWGui
void WindowManager::showCrosshair(bool show)
{
if (mHud)
mHud->setCrosshairVisible(show && mCrosshairEnabled);
mHud->setCrosshairVisible(show && Settings::hud().mCrosshair);
}
void WindowManager::updateActivatedQuickKey()

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

@ -457,7 +457,6 @@ namespace MWGui
MyGUI::Widget* mInputBlocker;
bool mCrosshairEnabled;
bool mHudEnabled;
bool mCursorVisible;
bool mCursorActive;