Fonts now properly reload

SuperTux · Aug 7, 2024 · 5c236f2 · 5c236f2
1 parent 0fb68f7
commit 5c236f2
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 4 deletions.
diff --git a/src/supertux/menu/debug_menu.cpp b/src/supertux/menu/debug_menu.cpp
@@ -31,6 +31,7 @@
 #include "util/gettext.hpp"
 #include "util/log.hpp"
 #include "video/texture_manager.hpp"
+#include "video/ttf_surface_manager.hpp"
 
 DebugMenu::DebugMenu() :
  next_game_speed(0)
@@ -78,9 +79,10 @@ DebugMenu::DebugMenu() :
  add_toggle(-1, _("Show Tile IDs in Editor Toolbox"), &g_debug.show_toolbox_tile_ids);
 
  add_entry(_("Reload Resources"), []{
- Resources::load();
  TextureManager::current()->reload();
+ TTFSurfaceManager::current()->clear_cache();
 
+ Resources::load(true);
  SpriteManager::current()->reload();
  TileManager::current()->reload();
  })

diff --git a/src/supertux/resources.cpp b/src/supertux/resources.cpp
@@ -48,7 +48,7 @@ SurfacePtr Resources::no_tile;
 std::string Resources::current_font;
 
 void
-Resources::load()
+Resources::load(bool reload)
 {
  // Load the mouse-cursor
  mouse_cursor.reset(new MouseCursor(SpriteManager::current()->create("images/engine/menu/mousecursor.sprite")));
@@ -69,7 +69,7 @@ Resources::load()
  console_font.reset(new TTFFont("fonts/SourceCodePro-Medium.ttf", 12, 1.25f, 0, 1));
 
  auto font = get_font_for_locale(g_dictionary_manager->get_language());
- if(font != current_font)
+ if(reload || font != current_font)
  {
  current_font = font;
  fixed_font.reset(new TTFFont(font, 18, 1.25f, 2, 1));

diff --git a/src/supertux/resources.hpp b/src/supertux/resources.hpp
@@ -62,7 +62,7 @@ class Resources final
  static SurfacePtr no_tile;
 
 public:
- static void load();
+ static void load(bool reload = false);
  static void unload();
  static bool needs_custom_font(const tinygettext::Language& locale);
  static std::string get_font_for_locale(const tinygettext::Language& locale);

diff --git a/src/video/ttf_surface_manager.cpp b/src/video/ttf_surface_manager.cpp
@@ -83,6 +83,13 @@ TTFSurfaceManager::get_cached_surface_width(const TTFFont& font,
  return entry.ttf_surface->get_width();
 }
 
+void
+TTFSurfaceManager::clear_cache()
+{
+ m_cache.clear();
+ m_cache_iter = m_cache.begin();
+}
+
 void
 TTFSurfaceManager::cache_cleanup_step()
 {

diff --git a/src/video/ttf_surface_manager.hpp b/src/video/ttf_surface_manager.hpp
@@ -39,6 +39,8 @@ class TTFSurfaceManager final : public Currenton<TTFSurfaceManager>
  // Returns -1 if there is no cached text surface
  int get_cached_surface_width(const TTFFont& font, const std::string& text);
 
+ void clear_cache();
+
  void print_debug_info(std::ostream& out);
 
 private: