From ff0add2ed00eb9feb7f2acdee68a159f1c32b391 Mon Sep 17 00:00:00 2001 From: Stenzek Date: Thu, 19 Jun 2025 22:17:00 +1000 Subject: [PATCH] ImGuiManager: Load PF before FA Works around code point conflicts, for now. Probably should just reallocate PF in the future though. --- src/util/imgui_manager.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/util/imgui_manager.cpp b/src/util/imgui_manager.cpp index cce6946ac..3db7c7ccc 100644 --- a/src/util/imgui_manager.cpp +++ b/src/util/imgui_manager.cpp @@ -862,14 +862,6 @@ bool ImGuiManager::CreateFontAtlas(Error* error) icon_cfg.GlyphMinAdvanceX = default_text_size; icon_cfg.GlyphMaxAdvanceX = default_text_size; - if (!ImGui::GetIO().Fonts->AddFontFromMemoryTTF(s_state.icon_fa_font_data.data(), - static_cast(s_state.icon_fa_font_data.size()), - default_text_size * 0.75f, 0.0f, &icon_cfg)) [[unlikely]] - { - Error::SetStringView(error, "Failed to add FA icon font"); - return false; - } - if (!ImGui::GetIO().Fonts->AddFontFromMemoryTTF(s_state.icon_pf_font_data.data(), static_cast(s_state.icon_pf_font_data.size()), default_text_size * 1.2f, 0.0f, &icon_cfg)) [[unlikely]] @@ -878,6 +870,14 @@ bool ImGuiManager::CreateFontAtlas(Error* error) return false; } + if (!ImGui::GetIO().Fonts->AddFontFromMemoryTTF(s_state.icon_fa_font_data.data(), + static_cast(s_state.icon_fa_font_data.size()), + default_text_size * 0.75f, 0.0f, &icon_cfg)) [[unlikely]] + { + Error::SetStringView(error, "Failed to add FA icon font"); + return false; + } + // Only for emoji font. icon_cfg.FontLoaderFlags = ImGuiFreeTypeLoaderFlags_LoadColor | ImGuiFreeTypeLoaderFlags_Bitmap;