From 9127198be70399a857d61b0a7140d12c88bd94ae Mon Sep 17 00:00:00 2001 From: Stenzek Date: Sat, 21 Jun 2025 20:34:00 +1000 Subject: [PATCH] ImGuiManager: Move font awesome to last priority Too many glyph conflicts. Fixes coloured icons. --- 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 3db7c7ccc..a21edf2e9 100644 --- a/src/util/imgui_manager.cpp +++ b/src/util/imgui_manager.cpp @@ -870,14 +870,6 @@ 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; @@ -889,6 +881,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; + } + // Now we can add the remaining text fonts. text_cfg.MergeMode = true; for (size_t i = 1; i < s_state.text_font_order.size(); i++)