Skip to content

Commit 126d004

Browse files
committed
Merge branch 'master' into docking
2 parents aa97252 + 97428e8 commit 126d004

File tree

8 files changed

+27
-14
lines changed

8 files changed

+27
-14
lines changed

docs/CHANGELOG.txt

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,11 @@ HOW TO UPDATE?
3636
- Please report any issue!
3737

3838
-----------------------------------------------------------------------
39-
VERSION 1.91.9 WIP (In Progress)
39+
VERSION 1.91.9 (Released 2025-03-14)
4040
-----------------------------------------------------------------------
4141

42+
Decorated log and release notes: https://github.com/ocornut/imgui/releases/tag/v1.91.9
43+
4244
Breaking changes:
4345

4446
- Image: removed 'tint_col' and 'border_col' parameter from Image() function. (#8131, #8238)
@@ -72,7 +74,7 @@ Other changes:
7274
RadioButton(), Selectable(). Regression from 2025/01/13. (#8370)
7375
- Windows: Fixed an issue where BeginChild() inside a collapsed Begin()
7476
wouldn't inherit the SkipItems flag, resulting in missing coarse clipping
75-
opportunity for code not checking the BeginChild() return value.
77+
opportunities for code not checking the BeginChild() return value.
7678
- Windows, Style: Added style.WindowBorderHoverPadding setting to configure
7779
inner/outer padding applied to hit-testing of windows borders and detection
7880
of hovered window.
@@ -124,6 +126,7 @@ Other changes:
124126
- Debug Tools: Added io.ConfigDebugHighlightIdConflictsShowItemPicker (defaults to true)
125127
to allow disabled Item Picker suggestion in user facing builds. (#7961, #7669)
126128
- Debug Tools: Tweaked layout of ID Stack Tool and always display full path. (#4631)
129+
- Misc: Various zealous warning fixes for newer version of Clang.
127130
- Misc: Added ImGuiMouseCursor_Wait and ImGuiMouseCursor_Progress mouse cursors
128131
(busy/wait/hourglass shape, with or without an arrow cursor).
129132
- Demo: Reorganized "Widgets" section to be alphabetically ordered and split in more functions.
@@ -140,7 +143,7 @@ Other changes:
140143
ImGuiKey_Slash, ImGuiKey_Semicolon, ImGuiKey_Equal, ImGuiKey_LeftBracket, ImGuiKey_RightBracket,
141144
ImGuiKey_Backslash, ImGuiKey_GraveAccent, and newly introduced ImGuiKey_Oem102.
142145
- This is NOT affecting characters used the text inputs.
143-
- Fixes many cases of keys not emitting a ImGuiKey value with certain keyboad layouts.
146+
- Fixes many cases of keys not emitting a ImGuiKey value with certain keyboard layouts.
144147
- Makes emitted ImGuiKey values more consistent regardless of keyboard mapping,
145148
but you may be getting different values as before.
146149
- Win32, SDL2, SDL3: Use scancodes for OEM keys.
@@ -156,7 +159,8 @@ Other changes:
156159
- Backends: SDL2, SDL3: Avoid calling SDL_GetGlobalMouseState() when mouse is in
157160
relative mode. (#8425, #8407) [@TheMode]
158161
- Backends: SDL2, SDL3: Only start SDL_CaptureMouse() when mouse is being dragged,
159-
to mitigate issues with e.g. Linux debuggers not claiming capture back. (#6410, #3650)
162+
to mitigate issues with e.g. Linux debuggers not claiming capture back on debug
163+
break. (#6410, #3650)
160164
- Backends: OpenGL3: Lazily reinitialize embedded GL loader for when calling backend
161165
from e.g. other DLL boundaries. (#8406)
162166
- Backends: DirectX12: Fixed an issue where pre-1.91.5 legacy ImGui_ImplDX12_Init()

imgui.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// dear imgui, v1.91.9 WIP
1+
// dear imgui, v1.91.9
22
// (main code and documentation)
33

44
// Help:
@@ -1156,17 +1156,19 @@ CODE
11561156
#pragma clang diagnostic ignored "-Wunknown-pragmas" // warning: unknown warning group 'xxx'
11571157
#pragma clang diagnostic ignored "-Wold-style-cast" // warning: use of old-style cast // yes, they are more terse.
11581158
#pragma clang diagnostic ignored "-Wfloat-equal" // warning: comparing floating point with == or != is unsafe // storing and comparing against same constants (typically 0.0f) is ok.
1159+
#pragma clang diagnostic ignored "-Wformat" // warning: format specifies type 'int' but the argument has type 'unsigned int'
11591160
#pragma clang diagnostic ignored "-Wformat-nonliteral" // warning: format string is not a string literal // passing non-literal to vsnformat(). yes, user passing incorrect format strings can crash the code.
1161+
#pragma clang diagnostic ignored "-Wformat-pedantic" // warning: format specifies type 'void *' but the argument has type 'xxxx *' // unreasonable, would lead to casting every %p arg to void*. probably enabled by -pedantic.
11601162
#pragma clang diagnostic ignored "-Wexit-time-destructors" // warning: declaration requires an exit-time destructor // exit-time destruction order is undefined. if MemFree() leads to users code that has been disabled before exit it might cause problems. ImGui coding style welcomes static/globals.
11611163
#pragma clang diagnostic ignored "-Wglobal-constructors" // warning: declaration requires a global destructor // similar to above, not sure what the exact difference is.
11621164
#pragma clang diagnostic ignored "-Wsign-conversion" // warning: implicit conversion changes signedness
1163-
#pragma clang diagnostic ignored "-Wformat-pedantic" // warning: format specifies type 'void *' but the argument has type 'xxxx *' // unreasonable, would lead to casting every %p arg to void*. probably enabled by -pedantic.
11641165
#pragma clang diagnostic ignored "-Wint-to-void-pointer-cast" // warning: cast to 'void *' from smaller integer type 'int'
11651166
#pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant" // warning: zero as null pointer constant // some standard header variations use #define NULL 0
11661167
#pragma clang diagnostic ignored "-Wdouble-promotion" // warning: implicit conversion from 'float' to 'double' when passing argument to function // using printf() is a misery with this as C++ va_arg ellipsis changes float to double.
11671168
#pragma clang diagnostic ignored "-Wimplicit-int-float-conversion" // warning: implicit conversion from 'xxx' to 'float' may lose precision
11681169
#pragma clang diagnostic ignored "-Wunsafe-buffer-usage" // warning: 'xxx' is an unsafe pointer used for buffer access
11691170
#pragma clang diagnostic ignored "-Wnontrivial-memaccess" // warning: first argument in call to 'memset' is a pointer to non-trivially copyable type
1171+
#pragma clang diagnostic ignored "-Wswitch-default" // warning: 'switch' missing 'default' label
11701172
#elif defined(__GNUC__)
11711173
// We disable -Wpragmas because GCC doesn't provide a has_warning equivalent and some forks/patches may not follow the warning/version association.
11721174
#pragma GCC diagnostic ignored "-Wpragmas" // warning: unknown option after '#pragma GCC diagnostic' kind

imgui.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// dear imgui, v1.91.9 WIP
1+
// dear imgui, v1.91.9
22
// (headers)
33

44
// Help:
@@ -28,8 +28,8 @@
2828

2929
// Library Version
3030
// (Integer encoded as XYYZZ for use in #if preprocessor conditionals, e.g. '#if IMGUI_VERSION_NUM >= 12345')
31-
#define IMGUI_VERSION "1.91.9 WIP"
32-
#define IMGUI_VERSION_NUM 19188
31+
#define IMGUI_VERSION "1.91.9"
32+
#define IMGUI_VERSION_NUM 19190
3333
#define IMGUI_HAS_TABLE
3434
#define IMGUI_HAS_VIEWPORT // Viewport WIP branch
3535
#define IMGUI_HAS_DOCK // Docking WIP branch

imgui_demo.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// dear imgui, v1.91.9 WIP
1+
// dear imgui, v1.91.9
22
// (demo code)
33

44
// Help:
@@ -160,6 +160,7 @@ Index of this file:
160160
#pragma clang diagnostic ignored "-Wold-style-cast" // warning: use of old-style cast // yes, they are more terse.
161161
#pragma clang diagnostic ignored "-Wdeprecated-declarations" // warning: 'xx' is deprecated: The POSIX name for this.. // for strdup used in demo code (so user can copy & paste the code)
162162
#pragma clang diagnostic ignored "-Wint-to-void-pointer-cast" // warning: cast to 'void *' from smaller integer type
163+
#pragma clang diagnostic ignored "-Wformat" // warning: format specifies type 'int' but the argument has type 'unsigned int'
163164
#pragma clang diagnostic ignored "-Wformat-security" // warning: format string is not a string literal
164165
#pragma clang diagnostic ignored "-Wexit-time-destructors" // warning: declaration requires an exit-time destructor // exit-time destruction order is undefined. if MemFree() leads to users code that has been disabled before exit it might cause problems. ImGui coding style welcomes static/globals.
165166
#pragma clang diagnostic ignored "-Wunused-macros" // warning: macro is not used // we define snprintf/vsnprintf on Windows so they are available, but not always used.
@@ -168,6 +169,7 @@ Index of this file:
168169
#pragma clang diagnostic ignored "-Wreserved-id-macro" // warning: macro name is a reserved identifier
169170
#pragma clang diagnostic ignored "-Wimplicit-int-float-conversion" // warning: implicit conversion from 'xxx' to 'float' may lose precision
170171
#pragma clang diagnostic ignored "-Wunsafe-buffer-usage" // warning: 'xxx' is an unsafe pointer used for buffer access
172+
#pragma clang diagnostic ignored "-Wswitch-default" // warning: 'switch' missing 'default' label
171173
#elif defined(__GNUC__)
172174
#pragma GCC diagnostic ignored "-Wpragmas" // warning: unknown option after '#pragma GCC diagnostic' kind
173175
#pragma GCC diagnostic ignored "-Wfloat-equal" // warning: comparing floating-point with '==' or '!=' is unsafe

imgui_draw.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// dear imgui, v1.91.9 WIP
1+
// dear imgui, v1.91.9
22
// (drawing and font code)
33

44
/*
@@ -68,6 +68,7 @@ Index of this file:
6868
#pragma clang diagnostic ignored "-Wunsafe-buffer-usage" // warning: 'xxx' is an unsafe pointer used for buffer access
6969
#pragma clang diagnostic ignored "-Wnontrivial-memaccess" // warning: first argument in call to 'memset' is a pointer to non-trivially copyable type
7070
#pragma clang diagnostic ignored "-Wcast-qual" // warning: cast from 'const xxxx *' to 'xxx *' drops const qualifier
71+
#pragma clang diagnostic ignored "-Wswitch-default" // warning: 'switch' missing 'default' label
7172
#elif defined(__GNUC__)
7273
#pragma GCC diagnostic ignored "-Wpragmas" // warning: unknown option after '#pragma GCC diagnostic' kind
7374
#pragma GCC diagnostic ignored "-Wunused-function" // warning: 'xxxx' defined but not used

imgui_internal.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// dear imgui, v1.91.9 WIP
1+
// dear imgui, v1.91.9
22
// (internal structures/api)
33

44
// You may use this file to debug, understand or extend Dear ImGui features but we don't provide any guarantee of forward compatibility.

imgui_tables.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// dear imgui, v1.91.9 WIP
1+
// dear imgui, v1.91.9
22
// (tables and columns code)
33

44
/*
@@ -221,6 +221,7 @@ Index of this file:
221221
#pragma clang diagnostic ignored "-Wunknown-pragmas" // warning: unknown warning group 'xxx'
222222
#pragma clang diagnostic ignored "-Wold-style-cast" // warning: use of old-style cast // yes, they are more terse.
223223
#pragma clang diagnostic ignored "-Wfloat-equal" // warning: comparing floating point with == or != is unsafe // storing and comparing against same constants (typically 0.0f) is ok.
224+
#pragma clang diagnostic ignored "-Wformat" // warning: format specifies type 'int' but the argument has type 'unsigned int'
224225
#pragma clang diagnostic ignored "-Wformat-nonliteral" // warning: format string is not a string literal // passing non-literal to vsnformat(). yes, user passing incorrect format strings can crash the code.
225226
#pragma clang diagnostic ignored "-Wsign-conversion" // warning: implicit conversion changes signedness
226227
#pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant" // warning: zero as null pointer constant // some standard header variations use #define NULL 0
@@ -230,6 +231,7 @@ Index of this file:
230231
#pragma clang diagnostic ignored "-Wimplicit-int-float-conversion" // warning: implicit conversion from 'xxx' to 'float' may lose precision
231232
#pragma clang diagnostic ignored "-Wunsafe-buffer-usage" // warning: 'xxx' is an unsafe pointer used for buffer access
232233
#pragma clang diagnostic ignored "-Wnontrivial-memaccess" // warning: first argument in call to 'memset' is a pointer to non-trivially copyable type
234+
#pragma clang diagnostic ignored "-Wswitch-default" // warning: 'switch' missing 'default' label
233235
#elif defined(__GNUC__)
234236
#pragma GCC diagnostic ignored "-Wpragmas" // warning: unknown option after '#pragma GCC diagnostic' kind
235237
#pragma GCC diagnostic ignored "-Wfloat-equal" // warning: comparing floating-point with '==' or '!=' is unsafe

imgui_widgets.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// dear imgui, v1.91.9 WIP
1+
// dear imgui, v1.91.9
22
// (widgets code)
33

44
/*
@@ -70,6 +70,7 @@ Index of this file:
7070
#pragma clang diagnostic ignored "-Wunknown-pragmas" // warning: unknown warning group 'xxx'
7171
#pragma clang diagnostic ignored "-Wold-style-cast" // warning: use of old-style cast // yes, they are more terse.
7272
#pragma clang diagnostic ignored "-Wfloat-equal" // warning: comparing floating point with == or != is unsafe // storing and comparing against same constants (typically 0.0f) is ok.
73+
#pragma clang diagnostic ignored "-Wformat" // warning: format specifies type 'int' but the argument has type 'unsigned int'
7374
#pragma clang diagnostic ignored "-Wformat-nonliteral" // warning: format string is not a string literal // passing non-literal to vsnformat(). yes, user passing incorrect format strings can crash the code.
7475
#pragma clang diagnostic ignored "-Wsign-conversion" // warning: implicit conversion changes signedness
7576
#pragma clang diagnostic ignored "-Wunused-macros" // warning: macro is not used // we define snprintf/vsnprintf on Windows so they are available, but not always used.
@@ -80,6 +81,7 @@ Index of this file:
8081
#pragma clang diagnostic ignored "-Wimplicit-int-float-conversion" // warning: implicit conversion from 'xxx' to 'float' may lose precision
8182
#pragma clang diagnostic ignored "-Wunsafe-buffer-usage" // warning: 'xxx' is an unsafe pointer used for buffer access
8283
#pragma clang diagnostic ignored "-Wnontrivial-memaccess" // warning: first argument in call to 'memset' is a pointer to non-trivially copyable type
84+
#pragma clang diagnostic ignored "-Wswitch-default" // warning: 'switch' missing 'default' label
8385
#elif defined(__GNUC__)
8486
#pragma GCC diagnostic ignored "-Wpragmas" // warning: unknown option after '#pragma GCC diagnostic' kind
8587
#pragma GCC diagnostic ignored "-Wfloat-equal" // warning: comparing floating-point with '==' or '!=' is unsafe

0 commit comments

Comments
 (0)