From 92eca4f8ffc6d22d53f473ec7f71bd045049ed2f Mon Sep 17 00:00:00 2001 From: Sam Hocevar Date: Mon, 8 Oct 2018 12:50:59 +0200 Subject: [PATCH] imgui: allow to create a context with a custom font atlas. --- src/lolimgui.cpp | 8 ++++---- src/lolimgui.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/lolimgui.cpp b/src/lolimgui.cpp index efbc4138..1567a257 100644 --- a/src/lolimgui.cpp +++ b/src/lolimgui.cpp @@ -28,9 +28,9 @@ static LolImGui* g_lolimgui = nullptr; #define Line(s) ((s) + "\n") //----------------------------------------------------------------------------- -LolImGui::LolImGui() +LolImGui::LolImGui(ImFontAtlas *shared_font_atlas) { - ImGui::CreateContext(); + ImGui::CreateContext(shared_font_atlas); m_gamegroup = GAMEGROUP_IMGUI; m_drawgroup = DRAWGROUP_IMGUI; @@ -113,9 +113,9 @@ LolImGui::~LolImGui() } //----------------------------------------------------------------------------- -void LolImGui::Init() +void LolImGui::Init(ImFontAtlas *shared_font_atlas) { - Ticker::Ref(g_lolimgui = new LolImGui()); + Ticker::Ref(g_lolimgui = new LolImGui(shared_font_atlas)); ImGuiIO& io = ImGui::GetIO(); //ImFont* font0 = io.Fonts->AddFontDefault(); diff --git a/src/lolimgui.h b/src/lolimgui.h index 597b2347..fcaf1f88 100644 --- a/src/lolimgui.h +++ b/src/lolimgui.h @@ -149,12 +149,12 @@ class LolImGui : public Entity public: //------------------------------------------------------------------------- - LolImGui(); + LolImGui(ImFontAtlas *shared_font_atlas); ~LolImGui(); std::string GetName() const { return ""; } //------------------------------------------------------------------------- - static void Init(); + static void Init(ImFontAtlas *shared_font_atlas = nullptr); static void Shutdown(); //-------------------------------------------------------------------------