mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-30 16:20:21 +00:00
Code Issues Projects Releases Wiki Activity

Make ComboBox usage consistent

Browse Source
This commit is contained in:
Andrei Kortunov 2022-07-27 13:03:24 +04:00
parent 4ac3c347ad
commit 351ce94f56
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
apps/openmw/mwgui/settingswindow.cpp
View File

@ -508,8 +508,7 @@ namespace MWGui
MWBase::Environment::get().getWindowManager()->interactiveMessageBox("#{SettingsMenu:ChangeRequiresRestart}", {"#{sOK}"}, true); MWBase::Environment::get().getWindowManager()->interactiveMessageBox("#{SettingsMenu:ChangeRequiresRestart}", {"#{sOK}"}, true);
const auto settingsNames = _sender->getUserData<std::vector<std::string>>(); Settings::Manager::setString("lighting method", "Shaders", *_sender->getItemDataAt<std::string>(pos));
Settings::Manager::setString("lighting method", "Shaders", settingsNames->at(pos));
apply(); apply();
} }
@ -528,7 +527,7 @@ namespace MWGui
const auto& languageCode = *_sender->getItemDataAt<std::string>(pos); const auto& languageCode = *_sender->getItemDataAt<std::string>(pos);
if (!languageCode.empty()) if (!languageCode.empty())
currentLocales[langPriority] = *_sender->getItemDataAt<std::string>(pos); currentLocales[langPriority] = languageCode;
else else
currentLocales.resize(1); currentLocales.resize(1);
@ -749,17 +748,13 @@ namespace MWGui
SceneUtil::LightingMethod::SingleUBO, SceneUtil::LightingMethod::SingleUBO,
}; };
std::vector<std::string> userData;
for (const auto& method : methods) for (const auto& method : methods)
{ {
if (!MWBase::Environment::get().getResourceSystem()->getSceneManager()->isSupportedLightingMethod(method)) if (!MWBase::Environment::get().getResourceSystem()->getSceneManager()->isSupportedLightingMethod(method))
continue; continue;
mLightingMethodButton->addItem(lightingMethodToStr(method)); mLightingMethodButton->addItem(lightingMethodToStr(method), SceneUtil::LightManager::getLightingMethodString(method));
userData.emplace_back(SceneUtil::LightManager::getLightingMethodString(method));
} }
mLightingMethodButton->setUserData(userData);
mLightingMethodButton->setIndexSelected(mLightingMethodButton->findItemIndexWith(lightingMethodStr)); mLightingMethodButton->setIndexSelected(mLightingMethodButton->findItemIndexWith(lightingMethodStr));
} }