Change skin font reload logic

supertuxkart · Sep 10, 2024 · 5a0b15a · 5a0b15a
1 parent fa59810
commit 5a0b15a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/src/states_screens/options/options_screen_ui.cpp b/src/states_screens/options/options_screen_ui.cpp
@@ -460,14 +460,14 @@ void OptionsScreenUI::eventCallback(Widget* widget, const std::string& name, con
         m_active_base_skin = m_base_skin_selector->getStringValue();
         loadCurrentSkinVariants();
         UserConfigParams::m_skin_file = getCurrentSpinnerSkin();
-        onSkinChange();
+        onSkinChange(false);
         m_reload_option->m_focus_name = "base_skinchoice";
         m_reload_option->m_focus_right = m_base_skin_selector->isButtonSelected(true/*right*/);
     }
     else if (name == "variant_skinchoice")
     {
         UserConfigParams::m_skin_file = getCurrentSpinnerSkin();
-        onSkinChange();
+        onSkinChange(true);
         m_reload_option->m_focus_name = "variant_skinchoice";
         m_reload_option->m_focus_right = m_variant_skin_selector->isButtonSelected(true/*right*/);
     }
@@ -648,14 +648,17 @@ void OptionsScreenUI::reloadGUIEngine()
 }   // reloadGUIEngine
 
 // -----------------------------------------------------------------------------
-void OptionsScreenUI::onSkinChange()
+void OptionsScreenUI::onSkinChange(bool is_variant)
 {
-    bool prev_font = GUIEngine::getSkin()->hasFont();
+    bool change_font = GUIEngine::getSkin()->hasFont();
     irr_driver->unsetMaxTextureSize();
     GUIEngine::reloadSkin();
     // Reload GUIEngine will clear widgets and set max texture Size so we don't do that here
     m_reload_option = std::unique_ptr<ReloadOption>(new ReloadOption);
-    m_reload_option->m_reload_font = prev_font != GUIEngine::getSkin()->hasFont();
+    // Check either old or new skin use custom_font
+    change_font |= GUIEngine::getSkin()->hasFont();
+    // Assume skin variants use the same font set
+    m_reload_option->m_reload_font = change_font && !is_variant;
     m_reload_option->m_reload_skin = true;
 } // onSkinChange
 

diff --git a/src/states_screens/options/options_screen_ui.hpp b/src/states_screens/options/options_screen_ui.hpp
@@ -65,7 +65,7 @@ class OptionsScreenUI : public GUIEngine::Screen, public GUIEngine::ScreenSingle
     int getBaseID(SkinID skin);
     int getVariantID(SkinID skin);
     std::string getCurrentSpinnerSkin();
-    void onSkinChange();
+    void onSkinChange(bool is_variant);
 public:
     friend class GUIEngine::ScreenSingleton<OptionsScreenUI>;