diff --git a/src/frontend-common/imgui_manager.cpp b/src/frontend-common/imgui_manager.cpp index f5e427dff..99dc08981 100644 --- a/src/frontend-common/imgui_manager.cpp +++ b/src/frontend-common/imgui_manager.cpp @@ -30,7 +30,7 @@ static void SetStyle(); static void SetKeyMap(); static bool LoadFontData(); static bool AddImGuiFonts(bool fullscreen_fonts); -static ImFont* AddTextFont(float size, bool full_range); +static ImFont* AddTextFont(float size); static ImFont* AddFixedFont(float size); static bool AddIconFonts(float size); static void AcquirePendingOSDMessages(); @@ -419,7 +419,7 @@ bool ImGuiManager::LoadFontData() return true; } -ImFont* ImGuiManager::AddTextFont(float size, bool full_range) +ImFont* ImGuiManager::AddTextFont(float size) { static const ImWchar default_ranges[] = { // Basic Latin + Latin Supplement + Central European diacritics @@ -445,7 +445,7 @@ ImFont* ImGuiManager::AddTextFont(float size, bool full_range) cfg.FontDataOwnedByAtlas = false; return ImGui::GetIO().Fonts->AddFontFromMemoryTTF(s_standard_font_data.data(), static_cast(s_standard_font_data.size()), size, &cfg, - (s_font_range && full_range) ? s_font_range : default_ranges); + s_font_range ? s_font_range : default_ranges); } ImFont* ImGuiManager::AddFixedFont(float size) @@ -478,7 +478,7 @@ bool ImGuiManager::AddImGuiFonts(bool fullscreen_fonts) ImGuiIO& io = ImGui::GetIO(); io.Fonts->Clear(); - s_standard_font = AddTextFont(standard_font_size, true); + s_standard_font = AddTextFont(standard_font_size); if (!s_standard_font || !AddIconFonts(standard_font_size)) return false; @@ -488,14 +488,13 @@ bool ImGuiManager::AddImGuiFonts(bool fullscreen_fonts) if (fullscreen_fonts) { - // Don't add full range for FSUI, we probably don't have the texture space, and it's not translated yet anyway. const float medium_font_size = std::ceil(ImGuiFullscreen::LayoutScale(ImGuiFullscreen::LAYOUT_MEDIUM_FONT_SIZE)); - s_medium_font = AddTextFont(medium_font_size, false); + s_medium_font = AddTextFont(medium_font_size); if (!s_medium_font || !AddIconFonts(medium_font_size)) return false; const float large_font_size = std::ceil(ImGuiFullscreen::LayoutScale(ImGuiFullscreen::LAYOUT_LARGE_FONT_SIZE)); - s_large_font = AddTextFont(large_font_size, false); + s_large_font = AddTextFont(large_font_size); if (!s_large_font || !AddIconFonts(large_font_size)) return false; }