mirrors/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2025-09-20 18:28:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,965 Commits 9 Branches 145 Tags
8c6096fcfe76987563cd02589db30d1510cb3936
Commit Graph

1814 Commits

Author SHA1 Message Date
ocornut
f4d9359095 Merge branch 'master' into docking 2025-04-10 17:26:11 +02:00
ocornut
9943137d1e TreeNode: fixed non-opened clipped child node not moving Y2 marker. (#2920) 2025-04-10 17:25:06 +02:00
ocornut
ee0d96ac0d TreeNode: extract code out of TreePop() into TreeNodeDrawLineToTreePop(). (#2920) 2025-04-10 17:00:29 +02:00
ocornut
8c977bf7b3 TreeNode, Tables: fixed ImGuiTreeNodeFlags_DrawLinesXXX feature when TreePop() is called in table: in no column or at top of row. (#2920) 2025-04-10 16:53:14 +02:00
ocornut
5311253468 TreeNode: ImGuiTreeNodeFlags_DrawLinesFull uses ToNodes Y2 when they are close (using a threshold). (#2920) 2025-04-10 16:03:39 +02:00
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
bbb0f0ade4 TreeNode: fixed incorrect clipping of arrow/bullet when using ImGuiTreeNodeFlags_SpanAllColumns. 2025-04-10 14:08:17 +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
43caca05c2 TreeNode: DrawLines: tweak X2 offset to avoid losing line when ItemSpacing is large. (#2920) 2025-04-09 18:57:20 +02:00
ocornut
bcbbfdaad4 TreeNode: DrawLines: latch X1 offset during TreePush(). (#2920) 2025-04-09 18:56:56 +02:00
ocornut
5e7174dec6 TreeNode: removed TreeLinesSize > 0.0f optimization check. (#2920) 
This is desirable but we'd need to avoid exposing 0.0f in style editor + assert on it.
 2025-04-09 17:40:15 +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
faa03031b4 Windows: loosened code to handle ImGuiButtonFlags_FlattenChildren so that master matches docking. (#8554) 
This essentially merges 059560d2 back into master.
 2025-04-07 18:21:34 +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
tanksdude
f5003aff69 Docs: Fix some typos (#8505) 2025-03-21 16:23:09 +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
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
Wizard
d6493aab02 Fix typo in comment (#8494) 2025-03-16 23:56:59 +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
b758b8223f InputText: Pasting a multi-line buffer into a single-line edit replaces carriage return by spaces. (#8459) 2025-03-13 19:30:59 +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
39585aa90d Amend Changelog to talk about OEM keys. (#7136, #7201, #7206, #7306, #7670, #7672, #8468) 
+ more consistently use Ctrl+XXX instead of Ctrl-XXX.
 2025-03-10 18:16:08 +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
935938bbd9 Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_glfw.cpp
 2025-03-03 18:57:42 +01:00
ocornut
c5ade6591e TextLink(), TextLinkOpenURL(): fixed honoring text baseline alignment. (#8451, #7660) 2025-03-02 13:40:51 +01:00
ocornut
15b96fd051 Merge branch 'master' into docking 
# Conflicts:
#	imgui.cpp
#	imgui_internal.h
 2025-02-27 22:01:51 +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
ef969a53f5 Tabs: fixed Unsaved Marker not being visible when Close Button is. (#8430, #8387) 2025-02-24 11:44:48 +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
Nico van Bentum
c4a32a129d Tabs: fixed middle-button to close not checking hovering, only close button visibility. (#8399, #8387) 
Main bug has been here since 54a60aaa4, but it's only ef7ffaff7 which made it very visible.
 2025-02-17 11:44:35 +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
2860d7ba05 Selectable: Fixed horizontal label alignment with SelectableTextAlign.x > 0 and specifying a selectable size. (#8338) 
Regression from ed7551c1d
 2025-02-14 19:44: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
ef7ffaff74 Styles, Tabs: (Breaking) Renamed TabMinWidthForCloseButton to TabCloseButtonMinWidthUnselected. Added TabCloseButtonMinWidthSelected. (#8387) 2025-02-12 15:46:17 +01:00