Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 71d39a4

Browse files
committedFeb 12, 2025
Merge branch 'master' into docking
# Conflicts: # backends/imgui_impl_sdl2.cpp # backends/imgui_impl_sdl3.cpp # imgui.cpp # imgui_internal.h
2 parents 8679cfa + a931fb7 commit 71d39a4

11 files changed

+188
-90
lines changed
 

‎backends/imgui_impl_opengl3.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -309,6 +309,7 @@ bool ImGui_ImplOpenGL3_Init(const char* glsl_version)
309309
// GLES 2
310310
bd->GlVersion = 200;
311311
bd->GlProfileIsES2 = true;
312+
IM_UNUSED(gl_version_str);
312313
#else
313314
// Desktop or GLES 3
314315
GLint major = 0;

‎backends/imgui_impl_sdl2.cpp

+3
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
// CHANGELOG
2727
// (minor and older changes stripped away, please see git history for details)
2828
// 2025-XX-XX: Platform: Added support for multiple windows via the ImGuiPlatformIO interface.
29+
// 2025-02-10: Using SDL_OpenURL() in platform_io.Platform_OpenInShellFn handler.
2930
// 2025-01-20: Made ImGui_ImplSDL2_SetGamepadMode(ImGui_ImplSDL2_GamepadMode_Manual) accept an empty array.
3031
// 2024-10-24: Emscripten: from SDL 2.30.9, SDL_EVENT_MOUSE_WHEEL event doesn't require dividing by 100.0f.
3132
// 2024-09-09: use SDL_Vulkan_GetDrawableSize() when available. (#7967, #3190)
@@ -534,6 +535,8 @@ static bool ImGui_ImplSDL2_Init(SDL_Window* window, SDL_Renderer* renderer, void
534535
platform_io.Platform_SetImeDataFn = ImGui_ImplSDL2_PlatformSetImeData;
535536
#ifdef __EMSCRIPTEN__
536537
platform_io.Platform_OpenInShellFn = [](ImGuiContext*, const char* url) { ImGui_ImplSDL2_EmscriptenOpenURL(url); return true; };
538+
#else
539+
platform_io.Platform_OpenInShellFn = [](ImGuiContext*, const char* url) { return SDL_OpenURL(url) == 0; };
537540
#endif
538541

539542
// Update monitor a first time during init

‎backends/imgui_impl_sdl3.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
// CHANGELOG
2525
// (minor and older changes stripped away, please see git history for details)
2626
// 2025-XX-XX: Platform: Added support for multiple windows via the ImGuiPlatformIO interface.
27+
// 2025-02-10: Using SDL_OpenURL() in platform_io.Platform_OpenInShellFn handler.
2728
// 2025-01-20: Made ImGui_ImplSDL3_SetGamepadMode(ImGui_ImplSDL3_GamepadMode_Manual) accept an empty array.
2829
// 2024-10-24: Emscripten: SDL_EVENT_MOUSE_WHEEL event doesn't require dividing by 100.0f on Emscripten.
2930
// 2024-09-11: (Docking) Added support for viewport->ParentViewportId field to support parenting at OS level. (#7973)
@@ -515,6 +516,7 @@ static bool ImGui_ImplSDL3_Init(SDL_Window* window, SDL_Renderer* renderer, void
515516
platform_io.Platform_SetClipboardTextFn = ImGui_ImplSDL3_SetClipboardText;
516517
platform_io.Platform_GetClipboardTextFn = ImGui_ImplSDL3_GetClipboardText;
517518
platform_io.Platform_SetImeDataFn = ImGui_ImplSDL3_PlatformSetImeData;
519+
platform_io.Platform_OpenInShellFn = [](ImGuiContext*, const char* url) { return SDL_OpenURL(url) == 0; };
518520

519521
// Update monitor a first time during init
520522
ImGui_ImplSDL3_UpdateMonitors();

‎docs/CHANGELOG.txt

+25
Original file line numberDiff line numberDiff line change
@@ -42,23 +42,48 @@ HOW TO UPDATE?
4242
Breaking changes:
4343

4444
- Renamed ImFontConfig::GlyphExtraSpacing.x option to GlyphExtraAdvanceX. (#242)
45+
- Renamed style.TabMinWidthForCloseButton to style.TabCloseButtonMinWidthUnselected.
4546

4647
Other changes:
4748

4849
- Fixed IsItemDeactivatedAfterEdit() signal being broken for Checkbox(),
4950
RadioButton(), Selectable(). Regression from 2025/01/13. (#8370)
51+
- Windows: Fixed an issue where BeginChild() inside a collapsed Begin()
52+
wouldn't inherit the SkipItems flag, resulting in missing coarse clipping
53+
opportunity for code not checking the BeginChild() return value.
5054
- Windows, Style: Added style.WindowBorderHoverPadding setting to configure
5155
inner/outer padding applied to hit-testing of windows borders and detection
5256
of hovered window.
57+
- InputText: Allow CTRL+Shift+Z to redo even outside of OSX. (#8389) [@tanksdude]
5358
- InputTextWithHint(): Fixed buffer-overflow (luckily often with no visible effect)
5459
when a user callback modified the buffer contents in a way that altered the
5560
visibility of the preview/hint buffer. (#8368) [@m9710797, @ocornut]
5661
- Scrollbar: Rework logic that fades-out scrollbar when it becomes too small,
5762
which amusingly made it disappear when using very big font/frame size.
63+
- Tables: fixed calling SetNextWindowScroll() on clipped scrolling table
64+
to not leak the value into a subsequent window. (#8196)
65+
- Tables: fixed an issue where Columns Visible/Hidden state wouldn't be correctly
66+
overridden when hot-reloading .ini state. (#7934)
67+
- Tables: tamed some .ini settings optimizations to more accurately allow
68+
overwriting/hot-reloading settings in more situations. (#7934)
69+
- Styles, Tabs: made the Close Button of selected tabs always visible by default,
70+
without requiring to hover the tab. (#8387)
71+
- Added style.TabCloseButtonMinWidthSelected/TabCloseButtonMinWidthUnselected settings
72+
to configure visibility of the Close Button for selected and unselected tabs.
73+
(-1: always visible. 0.0f: visible when hovered. >0.0f: visible when hovered if minimum width)
74+
- Default for selected tabs: TabCloseButtonMinWidthSelected = -1.0f (always visible)
75+
- Default for unselected tabs: TabCloseButtonMinWidthUnselected = 0.0f (visible when hovered)
76+
- TextLinkOpenURL(): fixed default Win32 io.PlatformOpenInShellFn handler to
77+
handle UTF-8 regardless of system regional settings. (#7660) [@achabense]
78+
- Demo: Combos: demonstrate a very simple way to add a filter to a combo,
79+
by showing the filter inside the combo contents. (#718)
80+
- Backends: SDL2, SDL3: Using SDL_OpenURL() in platform_io.Platform_OpenInShellFn
81+
handler. (#7660) [@achabense]
5882
- Backends: Metal: Fixed a crash on application resources. (#8367, #7419) [@anszom]
5983
- Backends: WebGPU: Fix for DAWN API rename WGPUProgrammableStageDescriptor -> WGPUComputeState.
6084
[@PhantomCloak] (#8369)
6185

86+
6287
-----------------------------------------------------------------------
6388
VERSION 1.91.8 (Released 2025-01-31)
6489
-----------------------------------------------------------------------

‎examples/example_win32_directx12/main.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ struct ExampleDescriptorHeapAllocator
5454
HeapHandleIncrement = device->GetDescriptorHandleIncrementSize(HeapType);
5555
FreeIndices.reserve((int)desc.NumDescriptors);
5656
for (int n = desc.NumDescriptors; n > 0; n--)
57-
FreeIndices.push_back(n);
57+
FreeIndices.push_back(n - 1);
5858
}
5959
void Destroy()
6060
{

0 commit comments

Comments
 (0)
Please sign in to comment.