Merge branch 'master' into context
diff --git a/examples/allegro5_example/imgui_impl_a5.cpp b/examples/allegro5_example/imgui_impl_a5.cpp
index 62f7af6..dddb4c3 100644
--- a/examples/allegro5_example/imgui_impl_a5.cpp
+++ b/examples/allegro5_example/imgui_impl_a5.cpp
@@ -200,7 +200,6 @@
void ImGui_ImplA5_Shutdown()
{
ImGui_ImplA5_InvalidateDeviceObjects();
- ImGui::Shutdown();
}
// You can read the io.WantCaptureMouse, io.WantCaptureKeyboard flags to tell if dear imgui wants to use your inputs.
diff --git a/examples/allegro5_example/main.cpp b/examples/allegro5_example/main.cpp
index 3c9c977..11ec724 100644
--- a/examples/allegro5_example/main.cpp
+++ b/examples/allegro5_example/main.cpp
@@ -23,6 +23,7 @@
al_register_event_source(queue, al_get_mouse_event_source());
// Setup ImGui binding
+ ImGui::CreateContext();
ImGui_ImplA5_Init(display);
// Setup style
@@ -109,6 +110,7 @@
// Cleanup
ImGui_ImplA5_Shutdown();
+ ImGui::DestroyContext();
al_destroy_event_queue(queue);
al_destroy_display(display);
diff --git a/examples/directx10_example/imgui_impl_dx10.cpp b/examples/directx10_example/imgui_impl_dx10.cpp
index 14a47c4..2ba6549 100644
--- a/examples/directx10_example/imgui_impl_dx10.cpp
+++ b/examples/directx10_example/imgui_impl_dx10.cpp
@@ -243,6 +243,9 @@
// PS: We treat DBLCLK messages as regular mouse down messages, so this code will work on windows classes that have the CS_DBLCLKS flag set. Our own example app code doesn't set this flag.
IMGUI_API LRESULT ImGui_ImplWin32_WndProcHandler(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
{
+ if (ImGui::GetCurrentContext() == NULL)
+ return 0;
+
ImGuiIO& io = ImGui::GetIO();
switch (msg)
{
@@ -569,7 +572,6 @@
void ImGui_ImplDX10_Shutdown()
{
ImGui_ImplDX10_InvalidateDeviceObjects();
- ImGui::Shutdown();
g_pd3dDevice = NULL;
g_hWnd = (HWND)0;
}
diff --git a/examples/directx10_example/main.cpp b/examples/directx10_example/main.cpp
index 38f4054..8b54fab 100644
--- a/examples/directx10_example/main.cpp
+++ b/examples/directx10_example/main.cpp
@@ -122,6 +122,7 @@
UpdateWindow(hwnd);
// Setup ImGui binding
+ ImGui::CreateContext();
ImGui_ImplDX10_Init(hwnd, g_pd3dDevice);
// Setup style
@@ -204,6 +205,8 @@
}
ImGui_ImplDX10_Shutdown();
+ ImGui::DestroyContext();
+
CleanupDeviceD3D();
UnregisterClass(_T("ImGui Example"), wc.hInstance);
diff --git a/examples/directx11_example/imgui_impl_dx11.cpp b/examples/directx11_example/imgui_impl_dx11.cpp
index 4963fc1..1df2e30 100644
--- a/examples/directx11_example/imgui_impl_dx11.cpp
+++ b/examples/directx11_example/imgui_impl_dx11.cpp
@@ -250,6 +250,9 @@
// PS: We treat DBLCLK messages as regular mouse down messages, so this code will work on windows classes that have the CS_DBLCLKS flag set. Our own example app code doesn't set this flag.
IMGUI_API LRESULT ImGui_ImplWin32_WndProcHandler(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
{
+ if (ImGui::GetCurrentContext() == NULL)
+ return 0;
+
ImGuiIO& io = ImGui::GetIO();
switch (msg)
{
@@ -571,7 +574,6 @@
void ImGui_ImplDX11_Shutdown()
{
ImGui_ImplDX11_InvalidateDeviceObjects();
- ImGui::Shutdown();
g_pd3dDevice = NULL;
g_pd3dDeviceContext = NULL;
g_hWnd = (HWND)0;
diff --git a/examples/directx11_example/main.cpp b/examples/directx11_example/main.cpp
index 79e7bb1..84db742 100644
--- a/examples/directx11_example/main.cpp
+++ b/examples/directx11_example/main.cpp
@@ -125,6 +125,7 @@
UpdateWindow(hwnd);
// Setup ImGui binding
+ ImGui::CreateContext();
ImGui_ImplDX11_Init(hwnd, g_pd3dDevice, g_pd3dDeviceContext);
// Setup style
@@ -207,6 +208,8 @@
}
ImGui_ImplDX11_Shutdown();
+ ImGui::DestroyContext();
+
CleanupDeviceD3D();
UnregisterClass(_T("ImGui Example"), wc.hInstance);
diff --git a/examples/directx9_example/imgui_impl_dx9.cpp b/examples/directx9_example/imgui_impl_dx9.cpp
index a4e6769..bd42eca 100644
--- a/examples/directx9_example/imgui_impl_dx9.cpp
+++ b/examples/directx9_example/imgui_impl_dx9.cpp
@@ -189,6 +189,9 @@
// PS: We treat DBLCLK messages as regular mouse down messages, so this code will work on windows classes that have the CS_DBLCLKS flag set. Our own example app code doesn't set this flag.
IMGUI_API LRESULT ImGui_ImplWin32_WndProcHandler(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
{
+ if (ImGui::GetCurrentContext() == NULL)
+ return 0;
+
ImGuiIO& io = ImGui::GetIO();
switch (msg)
{
@@ -288,7 +291,6 @@
void ImGui_ImplDX9_Shutdown()
{
ImGui_ImplDX9_InvalidateDeviceObjects();
- ImGui::Shutdown();
g_pd3dDevice = NULL;
g_hWnd = 0;
}
diff --git a/examples/directx9_example/main.cpp b/examples/directx9_example/main.cpp
index 09a109d..64159b9 100644
--- a/examples/directx9_example/main.cpp
+++ b/examples/directx9_example/main.cpp
@@ -75,6 +75,7 @@
}
// Setup ImGui binding
+ ImGui::CreateContext();
ImGui_ImplDX9_Init(hwnd, g_pd3dDevice);
// Setup style
@@ -173,6 +174,8 @@
}
ImGui_ImplDX9_Shutdown();
+ ImGui::DestroyContext();
+
if (g_pd3dDevice) g_pd3dDevice->Release();
if (pD3D) pD3D->Release();
UnregisterClass(_T("ImGui Example"), wc.hInstance);
diff --git a/examples/marmalade_example/imgui_impl_marmalade.cpp b/examples/marmalade_example/imgui_impl_marmalade.cpp
index 36fc832..0ce0edc 100644
--- a/examples/marmalade_example/imgui_impl_marmalade.cpp
+++ b/examples/marmalade_example/imgui_impl_marmalade.cpp
@@ -207,8 +207,6 @@
bool ImGui_Marmalade_Init(bool install_callbacks)
{
- IwGxInit();
-
ImGuiIO& io = ImGui::GetIO();
io.KeyMap[ImGuiKey_Tab] = s3eKeyTab; // Keyboard mapping. ImGui will use those indices to peek into the io.KeyDown[] array.
io.KeyMap[ImGuiKey_LeftArrow] = s3eKeyLeft;
@@ -248,8 +246,6 @@
void ImGui_Marmalade_Shutdown()
{
ImGui_Marmalade_InvalidateDeviceObjects();
- ImGui::Shutdown();
- IwGxTerminate();
}
void ImGui_Marmalade_NewFrame()
diff --git a/examples/marmalade_example/main.cpp b/examples/marmalade_example/main.cpp
index 2b5edb7..4ad1fe2 100644
--- a/examples/marmalade_example/main.cpp
+++ b/examples/marmalade_example/main.cpp
@@ -14,7 +14,10 @@
int main(int, char**)
{
+ IwGxInit();
+
// Setup ImGui binding
+ ImGui::CreateContext();
ImGui_Marmalade_Init(true);
// Setup style
@@ -95,6 +98,8 @@
// Cleanup
ImGui_Marmalade_Shutdown();
+ ImGui::DestroyContext();
+ IwGxTerminate();
return 0;
}
diff --git a/examples/null_example/main.cpp b/examples/null_example/main.cpp
index 04c1bda..f60b805 100644
--- a/examples/null_example/main.cpp
+++ b/examples/null_example/main.cpp
@@ -4,6 +4,7 @@
int main(int, char**)
{
+ ImGui::CreateContext();
ImGuiIO& io = ImGui::GetIO();
// Build atlas
@@ -27,7 +28,7 @@
ImGui::Render();
}
- printf("Shutdown()\n");
- ImGui::Shutdown();
+ printf("DestroyContext()\n");
+ ImGui::DestroyContext();
return 0;
}
diff --git a/examples/opengl2_example/imgui_impl_glfw_gl2.cpp b/examples/opengl2_example/imgui_impl_glfw_gl2.cpp
index e5fe2f4..4c450ed 100644
--- a/examples/opengl2_example/imgui_impl_glfw_gl2.cpp
+++ b/examples/opengl2_example/imgui_impl_glfw_gl2.cpp
@@ -246,7 +246,6 @@
void ImGui_ImplGlfwGL2_Shutdown()
{
ImGui_ImplGlfwGL2_InvalidateDeviceObjects();
- ImGui::Shutdown();
}
void ImGui_ImplGlfwGL2_NewFrame()
diff --git a/examples/opengl2_example/main.cpp b/examples/opengl2_example/main.cpp
index 6359f5b..ef4f876 100644
--- a/examples/opengl2_example/main.cpp
+++ b/examples/opengl2_example/main.cpp
@@ -27,6 +27,7 @@
glfwSwapInterval(1); // Enable vsync
// Setup ImGui binding
+ ImGui::CreateContext();
ImGui_ImplGlfwGL2_Init(window, true);
// Setup style
@@ -105,6 +106,7 @@
// Cleanup
ImGui_ImplGlfwGL2_Shutdown();
+ ImGui::DestroyContext();
glfwTerminate();
return 0;
diff --git a/examples/opengl3_example/imgui_impl_glfw_gl3.cpp b/examples/opengl3_example/imgui_impl_glfw_gl3.cpp
index a71fc51..3b39e18 100644
--- a/examples/opengl3_example/imgui_impl_glfw_gl3.cpp
+++ b/examples/opengl3_example/imgui_impl_glfw_gl3.cpp
@@ -358,7 +358,6 @@
void ImGui_ImplGlfwGL3_Shutdown()
{
ImGui_ImplGlfwGL3_InvalidateDeviceObjects();
- ImGui::Shutdown();
}
void ImGui_ImplGlfwGL3_NewFrame()
diff --git a/examples/opengl3_example/main.cpp b/examples/opengl3_example/main.cpp
index 6beb855..7c29cb7 100644
--- a/examples/opengl3_example/main.cpp
+++ b/examples/opengl3_example/main.cpp
@@ -32,6 +32,7 @@
gl3wInit();
// Setup ImGui binding
+ ImGui::CreateContext();
ImGui_ImplGlfwGL3_Init(window, true);
// Setup style
@@ -109,6 +110,7 @@
// Cleanup
ImGui_ImplGlfwGL3_Shutdown();
+ ImGui::DestroyContext();
glfwTerminate();
return 0;
diff --git a/examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp b/examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp
index 76def29..f937bcc 100644
--- a/examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp
+++ b/examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp
@@ -245,7 +245,6 @@
void ImGui_ImplSdlGL2_Shutdown()
{
ImGui_ImplSdlGL2_InvalidateDeviceObjects();
- ImGui::Shutdown();
}
void ImGui_ImplSdlGL2_NewFrame(SDL_Window *window)
diff --git a/examples/sdl_opengl2_example/main.cpp b/examples/sdl_opengl2_example/main.cpp
index 21b567a..115dfc6 100644
--- a/examples/sdl_opengl2_example/main.cpp
+++ b/examples/sdl_opengl2_example/main.cpp
@@ -33,6 +33,7 @@
SDL_GLContext glcontext = SDL_GL_CreateContext(window);
// Setup ImGui binding
+ ImGui::CreateContext();
ImGui_ImplSdlGL2_Init(window);
// Setup style
@@ -116,6 +117,8 @@
// Cleanup
ImGui_ImplSdlGL2_Shutdown();
+ ImGui::DestroyContext();
+
SDL_GL_DeleteContext(glcontext);
SDL_DestroyWindow(window);
SDL_Quit();
diff --git a/examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp b/examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
index 35d9cdd..a8c1363 100644
--- a/examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
+++ b/examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
@@ -356,7 +356,6 @@
void ImGui_ImplSdlGL3_Shutdown()
{
ImGui_ImplSdlGL3_InvalidateDeviceObjects();
- ImGui::Shutdown();
}
void ImGui_ImplSdlGL3_NewFrame(SDL_Window* window)
diff --git a/examples/sdl_opengl3_example/main.cpp b/examples/sdl_opengl3_example/main.cpp
index 7ee6038..3cd0716 100644
--- a/examples/sdl_opengl3_example/main.cpp
+++ b/examples/sdl_opengl3_example/main.cpp
@@ -33,6 +33,7 @@
gl3wInit();
// Setup ImGui binding
+ ImGui::CreateContext();
ImGui_ImplSdlGL3_Init(window);
// Setup style
@@ -115,6 +116,8 @@
// Cleanup
ImGui_ImplSdlGL3_Shutdown();
+ ImGui::DestroyContext();
+
SDL_GL_DeleteContext(glcontext);
SDL_DestroyWindow(window);
SDL_Quit();
diff --git a/examples/vulkan_example/imgui_impl_glfw_vulkan.cpp b/examples/vulkan_example/imgui_impl_glfw_vulkan.cpp
index b9e6d78..caf0312 100644
--- a/examples/vulkan_example/imgui_impl_glfw_vulkan.cpp
+++ b/examples/vulkan_example/imgui_impl_glfw_vulkan.cpp
@@ -787,7 +787,6 @@
void ImGui_ImplGlfwVulkan_Shutdown()
{
ImGui_ImplGlfwVulkan_InvalidateDeviceObjects();
- ImGui::Shutdown();
}
void ImGui_ImplGlfwVulkan_NewFrame()
diff --git a/examples/vulkan_example/main.cpp b/examples/vulkan_example/main.cpp
index 6c4ef33..b75fdaf 100644
--- a/examples/vulkan_example/main.cpp
+++ b/examples/vulkan_example/main.cpp
@@ -615,6 +615,7 @@
setup_vulkan(window);
// Setup ImGui binding
+ ImGui::CreateContext();
ImGui_ImplGlfwVulkan_Init_Data init_data = {};
init_data.allocator = g_Allocator;
init_data.gpu = g_Gpu;
@@ -737,6 +738,7 @@
VkResult err = vkDeviceWaitIdle(g_Device);
check_vk_result(err);
ImGui_ImplGlfwVulkan_Shutdown();
+ ImGui::DestroyContext();
cleanup_vulkan();
glfwTerminate();
diff --git a/imgui.cpp b/imgui.cpp
index b5aa30e..1717d2d 100644
--- a/imgui.cpp
+++ b/imgui.cpp
@@ -125,6 +125,7 @@
- A minimal application skeleton may be:
// Application init
+ ImGui::CreateContext();
ImGuiIO& io = ImGui::GetIO();
io.DisplaySize.x = 1920.0f;
io.DisplaySize.y = 1280.0f;
@@ -162,6 +163,10 @@
SwapBuffers();
}
+ // Shutdown
+ ImGui::DestroyContext();
+
+
- A minimal render function skeleton may be:
void void MyRenderFunction(ImDrawData* draw_data)
@@ -213,6 +218,12 @@
Here is a change-log of API breaking changes, if you are using one of the functions listed, expect to have to fix some code.
Also read releases logs https://github.com/ocornut/imgui/releases for more details.
+ - 2018/01/21 (1.XX) - reorganized context handling to be more explicit,
+ - YOU NOW NEED TO CALL ImGui::CreateContext() AT THE BEGINNING OF YOUR APP, AND CALL ImGui::DestroyContext() AT THE END.
+ - removed Shutdown() function, as DestroyContext() serve this purpose.
+ - you may pass a ImFontAtlas* pointer to CreateContext() to share a font atlas between contexts. Otherwhise CreateContext() will create its own font atlas instance.
+ - removed allocator parameters from CreateContext(), they are now setup with SetAllocatorFunctions(), and shared by all contexts.
+ - removed the default global context and font atlas instance, which were confusing for users of DLL reloading and users of multiple contexts.
- 2018/01/11 (1.54) - obsoleted IsAnyWindowHovered() in favor of IsWindowHovered(ImGuiHoveredFlags_AnyWindow). Kept redirection function (will obsolete).
- 2018/01/11 (1.54) - obsoleted IsAnyWindowFocused() in favor of IsWindowFocused(ImGuiFocusedFlags_AnyWindow). Kept redirection function (will obsolete).
- 2018/01/03 (1.54) - renamed ImGuiSizeConstraintCallback to ImGuiSizeCallback, ImGuiSizeConstraintCallbackData to ImGuiSizeCallbackData.
@@ -700,21 +711,32 @@
// Context
//-----------------------------------------------------------------------------
-// Default font atlas storage.
-// New contexts always point by default to this font atlas. It can be changed by reassigning the GetIO().Fonts variable.
-static ImFontAtlas GImDefaultFontAtlas;
-
-// Default context storage + current context pointer.
-// Implicitely used by all ImGui functions. Always assumed to be != NULL. Change to a different context by calling ImGui::SetCurrentContext()
-// If you are hot-reloading this code in a DLL you will lose the static/global variables. Create your own context+font atlas instead of relying on those default (see FAQ entry "How can I preserve my ImGui context across reloading a DLL?").
-// ImGui is currently not thread-safe because of this variable. If you want thread-safety to allow N threads to access N different contexts, you might work around it by:
+// Current context pointer. Implicitely used by all ImGui functions. Always assumed to be != NULL.
+// CreateContext() will automatically set this pointer if it is NULL. Change to a different context by calling ImGui::SetCurrentContext().
+// If you use DLL hotreloading you might need to call SetCurrentContext() after reloading code from this file.
+// ImGui functions are not thread-safe because of this pointer. If you want thread-safety to allow N threads to access N different contexts, you can:
+// - Change this variable to use thread local storage. You may #define GImGui in imconfig.h for that purpose. Future development aim to make this context pointer explicit to all calls. Also read https://github.com/ocornut/imgui/issues/586
// - Having multiple instances of the ImGui code compiled inside different namespace (easiest/safest, if you have a finite number of contexts)
-// - or: Changing this variable to be TLS. You may #define GImGui in imconfig.h for further custom hackery. Future development aim to make this context pointer explicit to all calls. Also read https://github.com/ocornut/imgui/issues/586
#ifndef GImGui
-static ImGuiContext GImDefaultContext;
-ImGuiContext* GImGui = &GImDefaultContext;
+ImGuiContext* GImGui = NULL;
#endif
+// Memory Allocator functions. Use SetAllocatorFunctions() to change them.
+// If you use DLL hotreloading you might need to call SetAllocatorFunctions() after reloading code from this file.
+// Otherwise, you probably don't want to modify them mid-program, and if you use global/static e.g. ImVector<> instances you may need to keep them accessible during program destruction.
+#ifndef IMGUI_DISABLE_DEFAULT_ALLOCATORS
+static void* MallocWrapper(size_t size, void* user_data) { (void)user_data; return malloc(size); }
+static void FreeWrapper(void* ptr, void* user_data) { (void)user_data; free(ptr); }
+#else
+static void* MallocWrapper(size_t size, void* user_data) { (void)user_data; (void)size; IM_ASSERT(0); return NULL; }
+static void FreeWrapper(void* ptr, void* user_data) { (void)user_data; (void)ptr; IM_ASSERT(0); }
+#endif
+
+static void* (*GImAllocatorAllocFunc)(size_t size, void* user_data) = MallocWrapper;
+static void (*GImAllocatorFreeFunc)(void* ptr, void* user_data) = FreeWrapper;
+static void* GImAllocatorUserData = NULL;
+static size_t GImAllocatorActiveAllocationsCount = 0;
+
//-----------------------------------------------------------------------------
// User facing structures
//-----------------------------------------------------------------------------
@@ -796,7 +818,7 @@
KeyRepeatRate = 0.050f;
UserData = NULL;
- Fonts = &GImDefaultFontAtlas;
+ Fonts = NULL;
FontGlobalScale = 1.0f;
FontDefault = NULL;
FontAllowUserScaling = false;
@@ -813,8 +835,6 @@
// Settings (User Functions)
RenderDrawListsFn = NULL;
- MemAllocFn = malloc;
- MemFreeFn = free;
GetClipboardTextFn = GetClipboardTextFn_DefaultImpl; // Platform dependent default implementations
SetClipboardTextFn = SetClipboardTextFn_DefaultImpl;
ClipboardUserData = NULL;
@@ -2179,14 +2199,14 @@
void* ImGui::MemAlloc(size_t sz)
{
- GImGui->IO.MetricsAllocs++;
- return GImGui->IO.MemAllocFn(sz);
+ GImAllocatorActiveAllocationsCount++;
+ return GImAllocatorAllocFunc(sz, GImAllocatorUserData);
}
void ImGui::MemFree(void* ptr)
{
- if (ptr) GImGui->IO.MetricsAllocs--;
- return GImGui->IO.MemFreeFn(ptr);
+ if (ptr) GImAllocatorActiveAllocationsCount--;
+ return GImAllocatorFreeFunc(ptr, GImAllocatorUserData);
}
const char* ImGui::GetClipboardText()
@@ -2221,32 +2241,40 @@
#endif
}
-ImGuiContext* ImGui::CreateContext(void* (*malloc_fn)(size_t), void (*free_fn)(void*))
+void ImGui::SetAllocatorFunctions(void* (*alloc_func)(size_t sz, void* user_data), void(*free_func)(void* ptr, void* user_data), void* user_data)
{
- if (!malloc_fn) malloc_fn = malloc;
- ImGuiContext* ctx = (ImGuiContext*)malloc_fn(sizeof(ImGuiContext));
- IM_PLACEMENT_NEW(ctx) ImGuiContext();
- ctx->IO.MemAllocFn = malloc_fn;
- ctx->IO.MemFreeFn = free_fn ? free_fn : free;
+ GImAllocatorAllocFunc = alloc_func;
+ GImAllocatorFreeFunc = free_func;
+ GImAllocatorUserData = user_data;
+}
+
+ImGuiContext* ImGui::CreateContext(ImFontAtlas* shared_font_atlas)
+{
+ ImGuiContext* ctx = IM_NEW(ImGuiContext)(shared_font_atlas);
+ if (GImGui == NULL)
+ SetCurrentContext(ctx);
return ctx;
}
void ImGui::DestroyContext(ImGuiContext* ctx)
{
- void (*free_fn)(void*) = ctx->IO.MemFreeFn;
- ctx->~ImGuiContext();
- free_fn(ctx);
+ if (ctx == NULL)
+ ctx = GImGui;
+ Shutdown(ctx);
if (GImGui == ctx)
SetCurrentContext(NULL);
+ IM_DELETE(ctx);
}
ImGuiIO& ImGui::GetIO()
{
+ IM_ASSERT(GImGui != NULL && "No current context. Did you call ImGui::CreateContext() or ImGui::SetCurrentContext()?");
return GImGui->IO;
}
ImGuiStyle& ImGui::GetStyle()
{
+ IM_ASSERT(GImGui != NULL && "No current context. Did you call ImGui::CreateContext() or ImGui::SetCurrentContext()?");
return GImGui->Style;
}
@@ -2278,6 +2306,7 @@
void ImGui::NewFrame()
{
+ IM_ASSERT(GImGui != NULL && "No current context. Did you call ImGui::CreateContext() or ImGui::SetCurrentContext()?");
ImGuiContext& g = *GImGui;
// Check user data
@@ -2294,7 +2323,7 @@
// Initialize on first frame
if (!g.Initialized)
- Initialize();
+ Initialize(&g);
g.Time += g.IO.DeltaTime;
g.FrameCount += 1;
@@ -2611,9 +2640,9 @@
}
}
-void ImGui::Initialize()
+void ImGui::Initialize(ImGuiContext* context)
{
- ImGuiContext& g = *GImGui;
+ ImGuiContext& g = *context;
g.LogClipboard = IM_NEW(ImGuiTextBuffer)();
// Add .ini handle for ImGuiWindow type
@@ -2632,13 +2661,13 @@
}
// This function is merely here to free heap allocations.
-void ImGui::Shutdown()
+void ImGui::Shutdown(ImGuiContext* context)
{
- ImGuiContext& g = *GImGui;
+ ImGuiContext& g = *context;
// The fonts atlas can be used prior to calling NewFrame(), so we clear it even if g.Initialized is FALSE (which would happen if we never called NewFrame)
- if (g.IO.Fonts) // Testing for NULL to allow user to NULLify in case of running Shutdown() on multiple contexts. Bit hacky.
- g.IO.Fonts->Clear();
+ if (g.IO.Fonts && g.FontAtlasOwnedByContext)
+ IM_DELETE(g.IO.Fonts);
// Cleanup of other data are conditional on actually having initialize ImGui.
if (!g.Initialized)
@@ -11674,7 +11703,7 @@
ImGui::Text("Dear ImGui %s", ImGui::GetVersion());
ImGui::Text("Application average %.3f ms/frame (%.1f FPS)", 1000.0f / ImGui::GetIO().Framerate, ImGui::GetIO().Framerate);
ImGui::Text("%d vertices, %d indices (%d triangles)", ImGui::GetIO().MetricsRenderVertices, ImGui::GetIO().MetricsRenderIndices, ImGui::GetIO().MetricsRenderIndices / 3);
- ImGui::Text("%d allocations", ImGui::GetIO().MetricsAllocs);
+ ImGui::Text("%d allocations", GImAllocatorActiveAllocationsCount);
static bool show_clip_rects = true;
ImGui::Checkbox("Show clipping rectangles when hovering an ImDrawCmd", &show_clip_rects);
ImGui::Separator();
diff --git a/imgui.h b/imgui.h
index a0453ee..e35dd7a 100644
--- a/imgui.h
+++ b/imgui.h
@@ -127,6 +127,14 @@
// In a namespace so that user can add extra functions in a separate file (e.g. Value() helpers for your vector or common types)
namespace ImGui
{
+ // Context creation and access, if you want to use multiple context, share context between modules (e.g. DLL).
+ // All contexts share a same ImFontAtlas by default. If you want different font atlas, you can new() them and overwrite the GetIO().Fonts variable of an ImGui context.
+ // All those functions are not reliant on the current context.
+ IMGUI_API ImGuiContext* CreateContext(ImFontAtlas* shared_font_atlas = NULL);
+ IMGUI_API void DestroyContext(ImGuiContext* ctx = NULL); // NULL = Destroy current context
+ IMGUI_API ImGuiContext* GetCurrentContext();
+ IMGUI_API void SetCurrentContext(ImGuiContext* ctx);
+
// Main
IMGUI_API ImGuiIO& GetIO();
IMGUI_API ImGuiStyle& GetStyle();
@@ -134,7 +142,6 @@
IMGUI_API void NewFrame(); // start a new ImGui frame, you can submit any command from this point until Render()/EndFrame().
IMGUI_API void Render(); // ends the ImGui frame, finalize the draw data, then call your io.RenderDrawListsFn() function if set.
IMGUI_API void EndFrame(); // ends the ImGui frame. automatically called by Render(), so most likely don't need to ever call that yourself directly. If you don't need to render you may call EndFrame() but you'll have wasted CPU already. If you don't need to render, better to not create any imgui windows instead!
- IMGUI_API void Shutdown();
// Demo, Debug, Informations
IMGUI_API void ShowDemoWindow(bool* p_open = NULL); // create demo/test window (previously called ShowTestWindow). demonstrate most ImGui features. call this to learn about the library! try to make it always available in your application!
@@ -143,6 +150,7 @@
IMGUI_API bool ShowStyleSelector(const char* label);
IMGUI_API void ShowFontSelector(const char* label);
IMGUI_API void ShowUserGuide(); // add basic help/info block (not a window): how to manipulate ImGui as a end-user (mouse/keyboard controls).
+ IMGUI_API const char* GetVersion();
// Window
IMGUI_API bool Begin(const char* name, bool* p_open = NULL, ImGuiWindowFlags flags = 0); // push window to the stack and start appending to it. see .cpp for details. return false when window is collapsed (so you can early out in your code) but you always need to call End() regardless. 'bool* p_open' creates a widget on the upper-right to close the window (which sets your bool to false).
@@ -504,20 +512,13 @@
IMGUI_API void CaptureKeyboardFromApp(bool capture = true); // manually override io.WantCaptureKeyboard flag next frame (said flag is entirely left for your application handle). e.g. force capture keyboard when your widget is being hovered.
IMGUI_API void CaptureMouseFromApp(bool capture = true); // manually override io.WantCaptureMouse flag next frame (said flag is entirely left for your application handle).
- // Helpers functions to access functions pointers in ImGui::GetIO()
- IMGUI_API void* MemAlloc(size_t sz);
+ // Helpers functions to access memory allocators and clipboard functions.
+ IMGUI_API void SetAllocatorFunctions(void* (*alloc_func)(size_t sz, void* user_data), void(*free_func)(void* ptr, void* user_data), void* user_data = NULL);
+ IMGUI_API void* MemAlloc(size_t size);
IMGUI_API void MemFree(void* ptr);
IMGUI_API const char* GetClipboardText();
IMGUI_API void SetClipboardText(const char* text);
- // Internal context access - if you want to use multiple context, share context between modules (e.g. DLL). There is a default context created and active by default.
- // All contexts share a same ImFontAtlas by default. If you want different font atlas, you can new() them and overwrite the GetIO().Fonts variable of an ImGui context.
- IMGUI_API const char* GetVersion();
- IMGUI_API ImGuiContext* CreateContext(void* (*malloc_fn)(size_t) = NULL, void (*free_fn)(void*) = NULL);
- IMGUI_API void DestroyContext(ImGuiContext* ctx);
- IMGUI_API ImGuiContext* GetCurrentContext();
- IMGUI_API void SetCurrentContext(ImGuiContext* ctx);
-
} // namespace ImGui
// Flags for ImGui::Begin()
@@ -919,11 +920,6 @@
void (*SetClipboardTextFn)(void* user_data, const char* text);
void* ClipboardUserData;
- // Optional: override memory allocations. MemFreeFn() may be called with a NULL pointer.
- // (default to posix malloc/free)
- void* (*MemAllocFn)(size_t sz);
- void (*MemFreeFn)(void* ptr);
-
// Optional: notify OS Input Method Editor of the screen position of your cursor for text input position (e.g. when using Japanese/Chinese IME in Windows)
// (default to use native imm32 api on Windows)
void (*ImeSetInputScreenPosFn)(int x, int y);
@@ -959,7 +955,6 @@
bool WantTextInput; // Mobile/console: when io.WantTextInput is true, you may display an on-screen keyboard. This is set by ImGui when it wants textual keyboard input to happen (e.g. when a InputText widget is active).
bool WantMoveMouse; // [BETA-NAV] MousePos has been altered, back-end should reposition mouse on next frame. Set only when 'NavMovesMouse=true'.
float Framerate; // Application framerate estimation, in frame per second. Solely for convenience. Rolling average estimation based on IO.DeltaTime over 120 frames
- int MetricsAllocs; // Number of active memory allocations
int MetricsRenderVertices; // Vertices output during last call to Render()
int MetricsRenderIndices; // Indices output during last call to Render() = number of triangles * 3
int MetricsActiveWindows; // Number of visible root windows (exclude child windows)
diff --git a/imgui_internal.h b/imgui_internal.h
index b30dde6..fab7840 100644
--- a/imgui_internal.h
+++ b/imgui_internal.h
@@ -500,6 +500,7 @@
struct ImGuiContext
{
bool Initialized;
+ bool FontAtlasOwnedByContext; // Io.Fonts-> is owned by the ImGuiContext and will be destructed along with it.
ImGuiIO IO;
ImGuiStyle Style;
ImFont* Font; // (Shortcut) == FontStack.empty() ? IO.Font : FontStack.back()
@@ -600,11 +601,13 @@
int WantTextInputNextFrame;
char TempBuffer[1024*3+1]; // temporary text buffer
- ImGuiContext() : OverlayDrawList(NULL)
+ ImGuiContext(ImFontAtlas* shared_font_atlas) : OverlayDrawList(NULL)
{
Initialized = false;
Font = NULL;
FontSize = FontBaseSize = 0.0f;
+ FontAtlasOwnedByContext = shared_font_atlas ? false : true;
+ IO.Fonts = shared_font_atlas ? shared_font_atlas : IM_NEW(ImFontAtlas)();
Time = 0.0f;
FrameCount = 0;
@@ -865,7 +868,8 @@
IMGUI_API void BringWindowToBack(ImGuiWindow* window);
IMGUI_API bool IsWindowChildOf(ImGuiWindow* window, ImGuiWindow* potential_parent);
- IMGUI_API void Initialize();
+ IMGUI_API void Initialize(ImGuiContext* context);
+ IMGUI_API void Shutdown(ImGuiContext* context); // Since 1.54 this is a _private_ function. You can call DestroyContext() to destroy the context created by CreateContext().
IMGUI_API void MarkIniSettingsDirty();
IMGUI_API ImGuiSettingsHandler* FindSettingsHandler(const char* type_name);
