mirrors/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-02-02 01:54:30 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,374 Commits 9 Branches 149 Tags
91ce8ccdbc331e321a6b627a5f7d1e98b55a100c
Commit Graph

1889 Commits

Author SHA1 Message Date
ocornut
d6d5580099 Merge branch 'master' into docking w/ custom fix in Scrollbar() 
# Conflicts:
#	backends/imgui_impl_win32.cpp
#	imgui.cpp
 2026-01-29 17:52:30 +01:00
ocornut
5166bec5d8 Scrollbar: rounding corners selected based on a generic helper. 
CalcRoundingFlagsForRectInRect() is backported and used multiple times by docking.
 2026-01-29 17:23:28 +01:00
Tom Seddon
ab6c9d9b12 Ignore -Wsign-conversion warnings when building with gcc. (#9192) 
Co-authored-by: Tom Seddon <tom@trlinux>
 2026-01-26 11:51:22 +01:00
ocornut
d12b1a938e Demo: improved Selectable() demos. (#9193) 2026-01-26 11:45:32 +01:00
Tom Seddon
08c777aeaa Ignore -Wsign-conversion warnings when building with gcc. (#9192) 
Co-authored-by: Tom Seddon <tom@trlinux>
 2026-01-24 18:21:23 +01:00
ocornut
2a08c87b8c Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_dx10.cpp
#	backends/imgui_impl_dx11.cpp
#	backends/imgui_impl_dx12.cpp
#	backends/imgui_impl_sdl2.cpp
#	backends/imgui_impl_sdl3.cpp
#	examples/example_glfw_metal/main.mm
#	examples/example_glfw_opengl2/main.cpp
#	examples/example_glfw_opengl3/main.cpp
#	examples/example_glfw_vulkan/main.cpp
#	examples/example_sdl2_directx11/main.cpp
#	examples/example_sdl2_opengl2/main.cpp
#	examples/example_sdl2_opengl3/main.cpp
#	examples/example_sdl2_sdlrenderer2/main.cpp
#	examples/example_sdl2_vulkan/main.cpp
#	examples/example_sdl3_directx11/main.cpp
#	examples/example_sdl3_opengl3/main.cpp
#	examples/example_sdl3_sdlgpu3/main.cpp
#	examples/example_sdl3_sdlrenderer3/main.cpp
#	examples/example_sdl3_vulkan/main.cpp
#	examples/example_win32_directx10/main.cpp
#	examples/example_win32_directx11/main.cpp
#	examples/example_win32_directx12/main.cpp
#	examples/example_win32_directx9/main.cpp
#	examples/example_win32_opengl3/main.cpp
#	examples/example_win32_vulkan/main.cpp
#	imgui_internal.h
 2026-01-23 16:05:50 +01:00
ocornut
3050f653cb Menus, Nav: made navigation into menu-bar auto wrap on X axis. (#9178) 2026-01-22 17:33:35 +01:00
ocornut
cb3b7ff4fb InputText: added mGuiInputTextCallbackData::EventActive helpers. (#9174) 2026-01-21 18:46:38 +01:00
ocornut
d448045669 InputText: Added ImGuiInputTextCallbackData::ID field. 2026-01-21 18:34:28 +01:00
ocornut
42b7704b70 InputText: add ImGuiInputTextState::SetSelection() helper + make TextSrc valid outside scope for non-read only fields. (#9174) 2026-01-21 18:19:03 +01:00
ocornut
12223cc3e9 Error handling: rework macros, add IM_ASSERT_USER_ERROR_RET(), IM_ASSERT_USER_ERROR_RETV() to simplify code. 2026-01-19 12:16:10 +01:00
ocornut
66e08b6575 Merge branch 'master' into docking (require next commit) 
# Conflicts:
#	backends/imgui_impl_glfw.cpp
#	backends/imgui_impl_glfw.h
#	backends/imgui_impl_osx.mm
#	backends/imgui_impl_sdl3.cpp
#	backends/imgui_impl_vulkan.cpp
#	backends/imgui_impl_vulkan.h
#	backends/imgui_impl_win32.cpp
#	imgui.cpp
 2026-01-14 19:42:11 +01:00
ocornut
a1dfaf4869 ImageButton() doesn't use a clamped style.FrameRounding value but instead adjust inner image rounding when FramePadding > FrameRounding. (#2942, #845) 2026-01-14 15:55:07 +01:00
ocornut
7143d711bf Images, Style: added style.ImageRounding, ImGuiStyleVar_ImageRounding to configure rounding of Image() widgets. (#2942, #845) 
Moving border drawing above AddImage() call, should not make a difference for square images.
 2026-01-14 15:55:03 +01:00
ocornut
0d08927dae Error handling: Improve error handling and recovery for EndMenu()/EndCombo(). (#1651, #9165, #8499) 2026-01-14 14:59:39 +01:00
ocornut
791ad9b82d InvisibleButton: allow calling with size (0,0) to fit to available content size. (#9166, #7623) 2026-01-13 16:15:48 +01:00
ocornut
1566c96ccd InputText, Nav: fixed remote/shortcut InputText() not teleporting mouse cursor when nav cursor is active and io.ConfigNavMoveSetMousePos is enabled. 
Motivated by this, also made SetFocusID() immediately set g.NavIdIsAlive, which is more correct and might be other (positive) subtle side effects.
 2026-01-08 17:04:52 +01:00
ocornut
9ce41a92c3 Misc/shallow merges from docking branch to reduce small drift. 2026-01-08 14:31:25 +01:00
ocornut
26f7b2f5aa Merge branch 'master' into docking 
# Conflicts:
#	imgui.cpp
 2025-12-21 18:05:20 +01:00
ocornut
4e7c05504a Renamed IM_ARRAYSIZE() -> IM_COUNTOF(). Kept legacy name for now. 2025-12-17 14:30:01 +01:00
ocornut
9ca7ea00c8 Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_glfw.cpp
#	backends/imgui_impl_glfw.h
#	backends/imgui_impl_opengl3.cpp
#	imgui.cpp
 2025-12-11 23:25:47 +01:00
ocornut
0d2dd30ee9 Tabs: minor tweaks to facilitate mods altering spacing. 2025-12-11 17:17:57 +01:00
ocornut
60f8b0733c Rework color marker internals to facilitate arbitrary override using SetNextItemColorMarker(). 
Amend fa4b47c
 2025-12-05 18:28:55 +01:00
ocornut
6327b63064 Merge branch 'master' into docking 
# Conflicts:
#	imgui.cpp
#	imgui_internal.h
 2025-12-05 16:38:51 +01:00
ocornut
fa4b47c5e2 Added RGBA color markers to ColorEdit3/ColorEdit4 + opt-in ImGuiSliderFlags_ColorMarkers for Drags/Sliders. 
+ Added ImGuiColorEditFlags_NoColorMarkers
+ Added style.ColorMarkerSize.
 2025-12-05 16:32:48 +01:00
ocornut
d1e262ad55 Internals: refactor RenderRectFilledRangeH() into RenderRectFilledInRangeH() to take absolute coordinates instead of normalized ones. 
Amend 01d4bf299a (#1296)
 2025-12-04 16:13:12 +01:00
ocornut
42e91c3155 Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_sdlgpu3.cpp
#	backends/imgui_impl_win32.cpp
 2025-12-03 13:35:35 +01:00
ocornut
620a33dd85 TreeNode: fixed highlight position when used inside a line with a large text baseline offset. 
Most old logic e.g. df749e3f13, ec0e953cca. Never quite worked for this situation.
 2025-11-27 23:49:17 +01:00
ocornut
2026e3db88 Menus: fixed BeginMenu() child popup position when used inside a line with a baseline offset. 2025-11-27 21:51:04 +01:00
ocornut
3ff8c466bf Menus: fixed BeginMenuEx() icon/arrow baseline when using inside a line with an offset. 
Amend 1f54665.
 2025-11-27 20:05:18 +01:00
ocornut
1f54665799 Menus: fixed MenuItem() label baseline when using inside a line with an offset. 
Amend f8fae02270
 2025-11-27 19:54:06 +01:00
ocornut
ae873b1e0d Misc: rename extraneous parenthesizes from return statements. 2025-11-27 15:01:24 +01:00
ocornut
772cbfd014 Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_vulkan.cpp
 2025-11-26 14:33:25 +01:00
ocornut
136d067eed Scrollbar: fixed a codepath leading to a divide-by-zero. (#9089) 2025-11-24 14:27:03 +01:00
ocornut
324cea1f41 Version 1.92.6 WIP 2025-11-24 13:35:41 +01:00
ocornut
3912b3d9a9 Merge branch 'master' into docking 2025-11-20 18:01:02 +01:00
ocornut
6d910d5487 Version 1.92.5 2025-11-20 17:49:52 +01:00
ocornut
5e462eb29b Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_glfw.cpp
 2025-11-18 19:20:08 +01:00
ocornut
9afc62d087 InputText: Fixed an assert when using ImGuiInputTextFlags_ReadOnly and making underlying contents shorter while text is selected. (#9069) 2025-11-18 16:20:51 +01:00
ocornut
219ba3b617 Merge branch 'master' into docking 
# Conflicts:
#	imgui.cpp
#	imgui_demo.cpp
#	imgui_internal.h
 2025-11-17 15:38:58 +01:00
ocornut
e60e5bff63 Misc: standardized casing of keyboard mods in comments and demo ("CTRL" -> "Ctrl"). 2025-11-13 15:24:03 +01:00
ocornut
3109131a88 Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_glfw.cpp
#	backends/imgui_impl_glfw.h
#	imgui.cpp
#	imgui_internal.h
 2025-11-06 18:11:16 +01:00
ocornut
bd0e2036e0 Drag and Drop: added ImGuiDragDropFlags_AcceptDrawAsHovered. (#8632) 
Not calling SetHoveredId() in that path, does not seem necessary.
 2025-11-06 18:07:18 +01:00
ocornut
1d942eb6c9 Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_win32.cpp
#	imgui.cpp
#	imgui_demo.cpp
#	imgui_internal.h
 2025-10-30 18:08:56 +01:00
ocornut
3c578fa87e InputText: restore truncating, now between UTF-8 codepoint. (#9029) 
Amend e612536, 2a194e2.
 2025-10-29 18:40:40 +01:00
ocornut
8df962a6ed Debug Tools: fixed DebugTextEncoding() potentially reading out of bounds if provided a trailing truncated UTF-8 sequence. 2025-10-29 17:58:52 +01:00
ocornut
2a194e21a0 InputText: revert truncation behavior from e612536 as it can truncate mid-UTF8. (#9029) 2025-10-29 17:24:23 +01:00
ocornut
9753c741b9 Disabled, ButtonBehavior: fixed a bug when a previously enabled item that got nav focus and then turns disabled could still be activated using keyboard. (#9036) 
ButtonBehavior() was relying on lack of nav focus for keyboard handling
 2025-10-29 16:43:27 +01:00
ocornut
7c483a0eba Add indentation to ButtonBehavior() - no logic change. 2025-10-29 16:39:37 +01:00
ocornut
8019d39545 Shuffle a few internal context fields to reduce padding. 2025-10-28 19:06:36 +01:00