ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

When changing base theme, keep the theme variant if possible

Browse Source
This commit is contained in:
Alayan 2024-05-27 19:25:17 +02:00
parent 9271c26576
commit d459d45925
No known key found for this signature in database
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/states_screens/options/options_screen_ui.cpp
View File

@ -349,6 +349,7 @@ void OptionsScreenUI::loadSkins(const std::set<std::string>& files, bool addon)
/** Set up the variant spinner with the appropriate values based on the current base skin. */ /** Set up the variant spinner with the appropriate values based on the current base skin. */
void OptionsScreenUI::loadCurrentSkinVariants() void OptionsScreenUI::loadCurrentSkinVariants()
{ {
core::stringw old_label = m_variant_skin_selector->getStringValue();
m_variant_skin_selector->clearLabels(); m_variant_skin_selector->clearLabels();
m_current_skin_variants.clear(); m_current_skin_variants.clear();
@ -365,6 +366,14 @@ void OptionsScreenUI::loadCurrentSkinVariants()
m_variant_skin_selector->m_properties[GUIEngine::PROP_MAX_VALUE] = m_variant_skin_selector->m_properties[GUIEngine::PROP_MAX_VALUE] =
StringUtils::toString(m_current_skin_variants.size()-1); StringUtils::toString(m_current_skin_variants.size()-1);
// When switching base theme, don't reset the variant spinner
// if the variant exists for both the previous and the new base theme.
for (int i=0; i<(int)m_current_skin_variants.size();i++)
{
if(m_current_skin_variants[i] == old_label)
m_variant_skin_selector->setValue(i);
}
bool in_game = StateManager::get()->getGameState() == GUIEngine::INGAME_MENU; bool in_game = StateManager::get()->getGameState() == GUIEngine::INGAME_MENU;
if (m_current_skin_variants.size() == 1) if (m_current_skin_variants.size() == 1)