github/duckstation
1
0
Fork 0
mirror of https://github.com/stenzek/duckstation.git synced 2025-06-28 06:10:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

ImGuiManager: Load PF before FA

Browse Source 
Works around code point conflicts, for now.

Probably should just reallocate PF in the future though.
This commit is contained in:
Stenzek 2025-06-19 22:17:00 +10:00
parent 6c6cc910e6
commit ff0add2ed0
No known key found for this signature in database
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/util/imgui_manager.cpp
View File

@ -862,14 +862,6 @@ bool ImGuiManager::CreateFontAtlas(Error* error)
icon_cfg.GlyphMinAdvanceX = default_text_size; icon_cfg.GlyphMinAdvanceX = default_text_size;
icon_cfg.GlyphMaxAdvanceX = default_text_size; icon_cfg.GlyphMaxAdvanceX = default_text_size;
if (!ImGui::GetIO().Fonts->AddFontFromMemoryTTF(s_state.icon_fa_font_data.data(),
static_cast<int>(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(), if (!ImGui::GetIO().Fonts->AddFontFromMemoryTTF(s_state.icon_pf_font_data.data(),
static_cast<int>(s_state.icon_pf_font_data.size()), static_cast<int>(s_state.icon_pf_font_data.size()),
default_text_size * 1.2f, 0.0f, &icon_cfg)) [[unlikely]] default_text_size * 1.2f, 0.0f, &icon_cfg)) [[unlikely]]
@ -878,6 +870,14 @@ bool ImGuiManager::CreateFontAtlas(Error* error)
return false; return false;
} }
if (!ImGui::GetIO().Fonts->AddFontFromMemoryTTF(s_state.icon_fa_font_data.data(),
static_cast<int>(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. // Only for emoji font.
icon_cfg.FontLoaderFlags = ImGuiFreeTypeLoaderFlags_LoadColor | ImGuiFreeTypeLoaderFlags_Bitmap; icon_cfg.FontLoaderFlags = ImGuiFreeTypeLoaderFlags_LoadColor | ImGuiFreeTypeLoaderFlags_Bitmap;