Commit Graph

2719 Commits

Author SHA1 Message Date
ocornut
ed50bb1676 TreeNode, Tables: fixed ImGuiTreeNodeFlags_DrawLinesXXX feature when TreePop() is called from a different column. (#2920) 2025-04-10 14:47:08 +02:00
ocornut
06c2c9f456 Merge branch 'master' into docking
# Conflicts:
#	backends/imgui_impl_sdl2.cpp
#	backends/imgui_impl_sdl3.cpp
2025-04-09 19:08:45 +02:00
ocornut
789de09dda TreeNode: extracted TreeNodeDrawLineToChildNode() for usage by custom widgets (#2920) 2025-04-09 12:04:09 +02:00
ocornut
47d1ab192a Merge branch 'master' into docking
# Conflicts:
#	backends/imgui_impl_vulkan.cpp
#	imgui_widgets.cpp
2025-04-08 19:59:38 +02:00
ocornut
39f34e1e58 TreeNode: Don't latch GetColorU32(ImGuiCol_TreeLines). (#2920)
Trade off doesn't seem worth it for large trees. User who really needs to alter colors can do it by adjusting Push/Pop locations.
2025-04-08 19:58:59 +02:00
ocornut
e5b218e6d1 TreeNode: added ImGuiTreeNodeFlags_DrawTreeXXX flags. (#2920)
# Conflicts:
#	docs/CHANGELOG.txt
2025-04-08 19:58:59 +02:00
ocornut
9701810bc3 TreeNode: adding ImGuiTreeNodeFlags_NoNavFocus in imgui_internal.h (#8551) 2025-04-07 11:41:21 +02:00
ocornut
df5690d91a Merge branch 'master' into docking
# 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) 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
ca3ba28768 Internals: made MousePos an argument of UpdateHoveredWindowAndCaptureFlags(). (#8431, #1152) 2025-03-21 17:21:45 +01:00
ocornut
790f2b9a7a Merge branch 'master' into docking 2025-03-19 17:54:42 +01:00
ocornut
0ecb2bbe74 Version 1.92.0 WIP 2025-03-19 17:45:20 +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
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
aa97252f60 Merge branch 'master' into docking
# Conflicts:
#	imgui_internal.h
2025-03-13 21:01:21 +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
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
fdsa
3c3d943fb1 Docs: Fix some typos (#8473) 2025-03-09 16:42:16 +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
ce13f6b73e Backends: GLFW: Fixed clipboard handler assertion when using GLFW <= 3.2.1 compiled with asserts enabled. (#8452)
Amend 8e4010479
2025-03-03 13:11:16 +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
6e29450f76 Internals: added IsItemActiveAsInputText() helper. 2025-02-25 16:02:10 +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
ocornut
78ec1272e9 ImDrawList: added InitialFringeScale in ImDrawListSharedData. Default to 1.0f.
This is to allow some DPI mods with less changes. Only the initial value in SetupDrawListSharedData() will need change.
2025-02-17 11:28:35 +01:00
ocornut
71d39a4634 Merge branch 'master' into docking
# Conflicts:
#	backends/imgui_impl_sdl2.cpp
#	backends/imgui_impl_sdl3.cpp
#	imgui.cpp
#	imgui_internal.h
2025-02-12 19:17:48 +01:00
ocornut
4dc9df6aae Tables: fixed an issue where Columns Visible/Hidden state wouldn't be correctly overridden when hot-reloading .ini state. (#7934) 2025-02-10 19:29:18 +01:00
ocornut
50dbb086f2 Tables: sneakily honor ImGuiNextWindowDataFlags_HasChildFlags/ImGuiNextWindowDataFlags_HasWindowFlags as a way to facilitate various hacks/workarounds. 2025-02-07 22:57:15 +01:00
ocornut
e5668b8c73 Internals: rename ImGuiNextWindowData::Flags to HasFlags for consistency and to reduce mistakes. 2025-02-07 22:48:31 +01:00
ocornut
8679cfa2d8 Merge branch 'master' into docking
# Conflicts:
#	backends/imgui_impl_glfw.cpp
#	backends/imgui_impl_glfw.h
#	examples/example_apple_metal/example_apple_metal.xcodeproj/project.pbxproj
#	imgui.cpp
2025-02-07 18:27:32 +01:00
ocornut
4982602f6f Windows, Style: Added style.WindowBorderHoverPadding setting to configure inner/outer padding applied to hit-testing of windows borders.
Amend 3c7177c6, 59f3c4fc2, ae7f833c6.
Could be latched inside windows to be multi-dpi friendly, but likely won't matter soon.
2025-02-07 18:16:04 +01:00
ocornut
d80347613a Merge branch 'master' into docking
# Conflicts:
#	backends/imgui_impl_metal.mm
#	imgui.cpp
#	imgui_internal.h
2025-02-03 18:42:24 +01:00
ocornut
f820bf7cd4 Version 1.91.9 WIP 2025-02-03 12:33:40 +01:00
ocornut
e2a99b5760 Internals: renamed GetIOEx() to GetIO(). Added GetPlatformIO() explicit context variant. 2025-01-31 18:28:31 +01:00
ocornut
11b3a7c8ca Merge branch 'master' into docking 2025-01-31 16:10:20 +01:00