Commit graph

6022 commits

Author SHA1 Message Date
ocornut
df5690d91a Merge branch 'master' into docking
Some checks are pending
build / Linux (push) Waiting to run
build / Emscripten (push) Waiting to run
build / Windows (push) Waiting to run
build / MacOS (push) Waiting to run
build / iOS (push) Waiting to run
build / Android (push) Waiting to run
# Conflicts:
#	backends/imgui_impl_osx.mm
#	backends/imgui_impl_sdl2.cpp
#	backends/imgui_impl_sdl3.cpp
#	imgui.cpp
2025-03-30 16:42:28 +02:00
ocornut
a26fcf58cc Nav: fixed assertion when holding gamepad FaceLeft/West button + pressing a keyboard key. (#8525)
Some checks are pending
build / Windows (push) Waiting to run
build / Linux (push) Waiting to run
build / MacOS (push) Waiting to run
build / iOS (push) Waiting to run
build / Emscripten (push) Waiting to run
build / Android (push) Waiting to run
2025-03-30 16:40:39 +02:00
ocornut
8bbdfefe05 Nav: added bool ConfigNavWindowingWithGamepad to disable windowing with gamepad. (#8525, #4828, #3255, #5641) 2025-03-30 15:05:27 +02:00
ocornut
187acb8609 Nav: polling gamepad for ImGuiKey_NavGamepadMenu use routing-friendly Shortcut() so Ctrl+Tab equivalent may be hijacked. (#8525, #4828, #3255, #5641) 2025-03-30 14:46:58 +02:00
ocornut
dbd9ae287a Windows: fixed SetNextWindowCollapsed()/SetWindowCollapsed() breaking codepath that preserve last contents size when collapsed. (#7691) 2025-03-23 12:57:14 +01:00
ocornut
ca3ba28768 Internals: made MousePos an argument of UpdateHoveredWindowAndCaptureFlags(). (#8431, #1152) 2025-03-21 17:21:45 +01:00
tanksdude
f5003aff69
Docs: Fix some typos (#8505) 2025-03-21 16:23:09 +01:00
ocornut
102f3f3a0d IO: variations in analog-only components of gamepad events do not interfere with trickling of mouse position events (#4921, #8508) 2025-03-21 16:18:36 +01:00
ocornut
790f2b9a7a Merge branch 'master' into docking 2025-03-19 17:54:42 +01:00
ocornut
d467950a5e Style, InputText: added ImGuiCol_InputTextCursor to configure color of the InputText cursor/caret. (#7031) 2025-03-19 17:50:40 +01:00
ocornut
0ecb2bbe74 Version 1.92.0 WIP 2025-03-19 17:45:20 +01:00
ocornut
ee48ffe021 Added comments about line/rect thickness needing scaling. (#7031) 2025-03-19 17:42:19 +01:00
ocornut
5679de60c5 Error Handling: added better report and recovery for extraneous EndPopup() call. (#1651, #8499) 2025-03-18 17:35:43 +01:00
ocornut
4806a1924f Merge branch 'master' into docking 2025-03-17 20:18:29 +01:00
ocornut
93b446a962 Backtrack of version tagging 1.92.0 > 1.91.9b for publishing a hotfix (#8496) 2025-03-17 19:39:52 +01:00
ocornut
bfaef8ca17 Version 1.92.0 WIP 2025-03-17 19:09:07 +01:00
ocornut
2737dbb1e1 Docs: Fixed typo. Very oops. (#8495) 2025-03-17 11:51:57 +01:00
ocornut
4d4f1fd364 Docs: retroactively document ConfigData->Sources renaming. (#8495)
Amend 4c0604e
2025-03-17 11:50:32 +01:00
ocornut
126d004f9e Merge branch 'master' into docking 2025-03-14 17:15:03 +01:00
ocornut
97428e8ac9 Version 1.91.9 2025-03-14 17:13:11 +01:00
ocornut
ea2a12112d Misc: Various zealous warning fixes for newer version of Clang. 2025-03-14 17:13:11 +01:00
ocornut
aa97252f60 Merge branch 'master' into docking
# Conflicts:
#	imgui_internal.h
2025-03-13 21:01:21 +01:00
ocornut
79bba34c5f Revert "Added ImGuiKey_AbntC1, ImGuiKey_AbntC2 + Backends: GLFW, Win32: added support. (#8468)"
This reverts commit 557c77e455.
2025-03-13 16:32:50 +01:00
ocornut
d9dad2f4a1 Scrollbar: stabilize visibility of ScrollbarX when detecting a feedback loop. (#8488, #3285, #4539) 2025-03-13 12:27:47 +01:00
ocornut
557c77e455 Added ImGuiKey_AbntC1, ImGuiKey_AbntC2 + Backends: GLFW, Win32: added support. (#8468) 2025-03-11 18:38:45 +01:00
ocornut
2d403a1614 Viewports: fixed an issue where window repositioning leading to a monitor change could have the window incorrectly get clamped within the boundaries of its previous monitor. (#8484) 2025-03-11 13:19:14 +01:00
ocornut
6972b6c380 Merge branch 'master' into docking
# Conflicts:
#	backends/imgui_impl_glfw.cpp
#	backends/imgui_impl_sdl2.cpp
#	backends/imgui_impl_sdl3.cpp
#	backends/imgui_impl_win32.cpp
2025-03-10 20:02:36 +01:00
ocornut
a9e53829d2 Backends: Win32, SDL2, SDL3, GLFW: prioritize scancodes instead of translated keycodes when dealing with OEM keys + Added ImGuiKey_Oem102. (#7136, #7201, #7206, #7306, #7670, #7672, #8468) 2025-03-10 18:01:29 +01:00
MegaMech
bb8d2957ee Docking: removed legacy assert preventing to call DockBuilderSplitNode() on an existing split node. (#8472) 2025-03-10 12:35:57 +01:00
fdsa
3c3d943fb1 Docs: Fix some typos (#8473) 2025-03-09 16:42:16 +01:00
TheMode
806731e37a Set IMGUI_DISABLE_DEFAULT_SHELL_FUNCTIONS on 3DS sdk (#8477, #8476) 2025-03-09 16:34:50 +01:00
ocornut
1ec99f4fd3 Internals: added ImStrlen/ImMemchr #define to facilitate experimenting with variations. (#8421) 2025-03-07 11:09:07 +01:00
ocornut
19d060cc26 Merge branch 'master' into docking
# Conflicts:
#	imgui.cpp
2025-03-05 20:33:16 +01:00
ocornut
9f49292b35 Internals: Menus: reworked mangling of menu windows to use "###Menu_00" etc. instead of "##Menu_00". 2025-03-05 15:47:57 +01:00
ocornut
119dfbc627 Debug Tools: Tweaked layout of ID Stack Tool and always display full path. (#4631) 2025-03-05 15:04:26 +01:00
ocornut
df31774327 Disabled: Fixed an issue restoring Alpha in EndDisabled() when using nested BeginDisabled() calls with PushStyleVar(ImGuiStyleVar_DisabledAlpha) within. (#8454, #7640) 2025-03-03 19:20:10 +01:00
ocornut
935938bbd9 Merge branch 'master' into docking
# Conflicts:
#	backends/imgui_impl_glfw.cpp
2025-03-03 18:57:42 +01:00
ocornut
4819eae867 Clipper: Fixed an issue where passing an out of bound index to IncludeItemByIndex() could incorrectly offset the final cursor.
One case where it would manifest was calling Combo() with an out of range index. (#8450)
2025-03-02 14:15:11 +01:00
ocornut
9c2876b9f8 ShowFontAtlas() uses ImageWithBg(). (#8131, #8238)
Amend 494ea57
2025-02-27 22:04:56 +01:00
ocornut
15b96fd051 Merge branch 'master' into docking
# Conflicts:
#	imgui.cpp
#	imgui_internal.h
2025-02-27 22:01:51 +01:00
ocornut
482a1f50b6 Internals: rename ImGuiDataVarInfo to ImGuiStyleVarInfo. Move ImGuiStyleMod, ImGuiColorMod to own section.
# Conflicts:
#	imgui.cpp
2025-02-27 21:51:07 +01:00
ocornut
494ea57b65 Image: removed 'tint_col', 'border_col' parameters from Image(). Added ImageWithBg(). Added style.ImageBorderSize, ImGuiStyleVar_ImageBorderSize. (#8131, #8238)
Displaying a black background behind Font Atlas texture.
2025-02-27 21:48:24 +01:00
ocornut
3fb14b50f8 Merge branch 'master' into docking
# Conflicts:
#	backends/imgui_impl_dx12.cpp
#	backends/imgui_impl_sdl2.cpp
#	backends/imgui_impl_sdl3.cpp
#	imgui.cpp
2025-02-26 21:08:45 +01:00
ocornut
4c0604ec2e Font: shallow refactor, rename ConfigData[] fields to Sources[], ConfigDataCount to SourcesCount.
In theory this is all internal stuff.
2025-02-25 17:41:29 +01:00
ocornut
030746faff Debug Tools: Added io.ConfigDebugHighlightIdConflictsShowItemPicker. (#7961, #7669) 2025-02-24 17:45:16 +01:00
ocornut
edc66d79c7 Nav: extract code into a NavUpdateWindowingApplyFocus() so it may be reused elsewhere. 2025-02-21 23:11:11 +01:00
ocornut
773060155f Merge branch 'master' into docking
# Conflicts:
#	backends/imgui_impl_glfw.cpp
#	backends/imgui_impl_glfw.h
#	backends/imgui_impl_opengl3.cpp
#	backends/imgui_impl_osx.h
#	backends/imgui_impl_osx.mm
#	backends/imgui_impl_sdl2.cpp
#	backends/imgui_impl_sdl3.cpp
#	backends/imgui_impl_win32.cpp
#	imgui.cpp
2025-02-21 19:56:20 +01:00
ocornut
434b7710f3 Internals: packing ImGuiDataVarInfo + misc renaming + value of ImGuiDataType_Pointer doesn't need to be Count+1 2025-02-21 19:26:24 +01:00
ocornut
6dc376f676 ImFontAtlas: added software/drawlist version of ImGuiMouseCursor_Wait/ImGuiMouseCursor_Progress + moved GetMouseCursorTexData() to internals. 2025-02-20 12:17:21 +01:00
ocornut
afd659bb92 Merge branch 'master' into docking
# Conflicts:
#	backends/imgui_impl_sdl2.cpp
#	backends/imgui_impl_vulkan.cpp
2025-02-17 11:46:16 +01:00