diff options
| author | Andre Weissflog <floooh@gmail.com> | 2024-09-10 14:38:39 +0200 |
|---|---|---|
| committer | Andre Weissflog <floooh@gmail.com> | 2024-09-10 14:38:47 +0200 |
| commit | 1eb96dd0f96b9ea73065f9078244c2255c2b75d9 (patch) | |
| tree | 4b903b2a94ebed8c43acf904a1c23c04ada326d6 | |
| parent | 90186789884646f5fe640edea1d8441feb02f590 (diff) | |
sokol_imgui.h: update for Dear ImGui 1.91.1 (fixed https://github.com/floooh/sokol/issues/1105)
| -rw-r--r-- | CHANGELOG.md | 6 | ||||
| -rw-r--r-- | util/sokol_imgui.h | 14 |
2 files changed, 14 insertions, 6 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 0ac821b0..3e685621 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ ## Updates +### 10-Sep-2024 + +- Update sokol_imgui.h for Dear ImGui and cimgui version 1.91.1. This + breaks compatibility with older ImGui versions. + Fixes issue https://github.com/floooh/sokol/issues/1105. + ### 02-Sep-2024 - Minor breaking change in sokol_gfx.h: The enum item `SG_FILTER_NONE` has been diff --git a/util/sokol_imgui.h b/util/sokol_imgui.h index 05426791..3d0a5af5 100644 --- a/util/sokol_imgui.h +++ b/util/sokol_imgui.h @@ -1844,13 +1844,13 @@ static const char* _simgui_fs_source_dummy = ""; #endif #if !defined(SOKOL_IMGUI_NO_SOKOL_APP) -static void _simgui_set_clipboard(void* user_data, const char* text) { - (void)user_data; +static void _simgui_set_clipboard(ImGuiContext* ctx, const char* text) { + (void)ctx; sapp_set_clipboard_string(text); } -static const char* _simgui_get_clipboard(void* user_data) { - (void)user_data; +static const char* _simgui_get_clipboard(ImGuiContext* ctx) { + (void)ctx; return sapp_get_clipboard_string(); } #endif @@ -2200,6 +2200,7 @@ SOKOL_API_IMPL void simgui_setup(const simgui_desc_t* desc) { ImGui::CreateContext(); ImGui::StyleColorsDark(); ImGuiIO* io = &ImGui::GetIO(); + ImGuiPlatformIO* pio = &ImGui::GetPlatformIO(); if (!_simgui.desc.no_default_font) { io->Fonts->AddFontDefault(); } @@ -2207,6 +2208,7 @@ SOKOL_API_IMPL void simgui_setup(const simgui_desc_t* desc) { igCreateContext(NULL); igStyleColorsDark(igGetStyle()); ImGuiIO* io = igGetIO(); + ImGuiPlatformIO* pio = igGetPlatformIO(); if (!_simgui.desc.no_default_font) { ImFontAtlas_AddFontDefault(io->Fonts, NULL); } @@ -2218,8 +2220,8 @@ SOKOL_API_IMPL void simgui_setup(const simgui_desc_t* desc) { if (!_simgui.desc.disable_set_mouse_cursor) { io->BackendFlags |= ImGuiBackendFlags_HasMouseCursors; } - io->SetClipboardTextFn = _simgui_set_clipboard; - io->GetClipboardTextFn = _simgui_get_clipboard; + pio->Platform_SetClipboardTextFn = _simgui_set_clipboard; + pio->Platform_GetClipboardTextFn = _simgui_get_clipboard; #endif io->ConfigWindowsResizeFromEdges = !_simgui.desc.disable_windows_resize_from_edges; |