Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2025-07-04 12:08:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

TODO list update + Changelog and comments for #1803.

Browse Source
This commit is contained in:
omar
2018-05-09 15:47:41 +02:00
parent 895647a240
commit 39f4761ff7
4 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp
View File

@ -21,6 +21,7 @@
// CHANGELOG
// (minor and older changes stripped away, please see git history for details)
// 2018-05-09: Misc: Fixed clipboard paste memory leak (we didn't call SDL_FreeMemory on the data returned by SDL_GetClipboardText).
// 2018-03-20: Misc: Setup io.BackendFlags ImGuiBackendFlags_HasMouseCursors flag + honor ImGuiConfigFlags_NoMouseCursorChange flag.
// 2018-02-16: Inputs: Added support for mouse cursors, honoring ImGui::GetMouseCursor() value.
// 2018-02-16: Misc: Obsoleted the io.RenderDrawListsFn callback and exposed ImGui_ImplSdlGL2_RenderDrawData() in the .h file so you can call it yourself.
@ -136,9 +137,9 @@ void ImGui_ImplSdlGL2_RenderDrawData(ImDrawData* draw_data)
static const char* ImGui_ImplSdlGL2_GetClipboardText(void*)
{
if (g_ClipboardTextData) SDL_free(g_ClipboardTextData);
if (g_ClipboardTextData)
SDL_free(g_ClipboardTextData);
g_ClipboardTextData = SDL_GetClipboardText();
return g_ClipboardTextData;
}
@ -289,8 +290,9 @@ void ImGui_ImplSdlGL2_Shutdown()
SDL_FreeCursor(g_MouseCursors[cursor_n]);
memset(g_MouseCursors, 0, sizeof(g_MouseCursors));
// Remove previously allocated clipboard text data
if (g_ClipboardTextData) SDL_free(g_ClipboardTextData);
// Destroy last known clipboard data
if (g_ClipboardTextData)
SDL_free(g_ClipboardTextData);
// Destroy OpenGL objects
ImGui_ImplSdlGL2_InvalidateDeviceObjects();

10
examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
View File

@ -14,6 +14,7 @@
// CHANGELOG
// (minor and older changes stripped away, please see git history for details)
// 2018-05-09: Misc: Fixed clipboard paste memory leak (we didn't call SDL_FreeMemory on the data returned by SDL_GetClipboardText).
// 2018-03-20: Misc: Setup io.BackendFlags ImGuiBackendFlags_HasMouseCursors flag + honor ImGuiConfigFlags_NoMouseCursorChange flag.
// 2018-03-06: OpenGL: Added const char* glsl_version parameter to ImGui_ImplSdlGL3_Init() so user can override the GLSL version e.g. "#version 150".
// 2018-02-23: OpenGL: Create the VAO in the render function so the setup can more easily be used with multiple shared GL context.
@ -184,9 +185,9 @@ void ImGui_ImplSdlGL3_RenderDrawData(ImDrawData* draw_data)
static const char* ImGui_ImplSdlGL3_GetClipboardText(void*)
{
if (g_ClipboardTextData) SDL_free(g_ClipboardTextData);
if (g_ClipboardTextData)
SDL_free(g_ClipboardTextData);
g_ClipboardTextData = SDL_GetClipboardText();
return g_ClipboardTextData;
}
@ -422,8 +423,9 @@ void ImGui_ImplSdlGL3_Shutdown()
SDL_FreeCursor(g_MouseCursors[cursor_n]);
memset(g_MouseCursors, 0, sizeof(g_MouseCursors));
// Remove previously allocated clipboard text data
if (g_ClipboardTextData) SDL_free(g_ClipboardTextData);
// Destroy last known clipboard data
if (g_ClipboardTextData)
SDL_free(g_ClipboardTextData);
// Destroy OpenGL objects
ImGui_ImplSdlGL3_InvalidateDeviceObjects();