impr: Better font loading logic

This commit is contained in:
WerWolv
2024-06-16 22:41:16 +02:00
parent deee76e455
commit f49715c7a0
8 changed files with 351 additions and 264 deletions

View File

@@ -932,9 +932,9 @@ namespace hex {
s_fontSize = size;
}
static AutoReset<std::shared_ptr<ImFontAtlas>> s_fontAtlas;
static AutoReset<ImFontAtlas*> s_fontAtlas;
void setFontAtlas(ImFontAtlas* fontAtlas) {
s_fontAtlas = std::unique_ptr<ImFontAtlas, void(*)(ImFontAtlas*)>(fontAtlas, IM_DELETE);
s_fontAtlas = fontAtlas;
}
static ImFont *s_boldFont = nullptr;
@@ -1017,7 +1017,7 @@ namespace hex {
}
ImFontAtlas* getFontAtlas() {
return impl::s_fontAtlas->get();
return impl::s_fontAtlas;
}
ImFont* Bold() {