1871 Commits

Author SHA1 Message Date
ocornut
191a728ecc (Breaking) added ImTextureRef struct. Changed ImDrawCmd::TextureId to TexRef.
Softly breaking. May require support from language binding generator.
Rebased and reworked completely on 2025/03/19.
2025-06-11 15:02:36 +02:00
ocornut
e55415bfef (Breaking) renamed/moved ImGuiConfigFlags_DpiEnableScaleFonts -> ioConfigDpiScaleFonts, ImGuiConfigFlags_DpiEnableScaleViewports -> io.ConfigDpiScaleViewports 2025-06-11 15:02:06 +02:00
ocornut
eaac68ca2c Merge branch 'master' into docking
# Conflicts:
#	imgui_demo.cpp
2025-06-04 22:30:43 +02:00
ocornut
c3d7ada9df Demo: add indentation to simplify upcoming merges. 2025-06-04 22:27:34 +02:00
ocornut
91f72bbe1c Demo: omit ImGui:: prefix from ShowStyleEditor(), ShowUserGuide() code. 2025-06-04 21:29:12 +02:00
ocornut
9485aeb5c8 Demo: changed default framed item width to use Min(GetFontSize() * 12, GetContentRegionAvail().x * 0.40f). 2025-06-04 17:35:45 +02:00
ocornut
2bf57bbad4 Refactor: move SetCurrentFont(), PushFont(), PopFont() to a section.
+ Add commented out config flags.
2025-05-27 18:31:55 +02:00
ocornut
e11ad6b77e Merge branch 'master' into docking
# Conflicts:
#	backends/imgui_impl_sdl2.cpp
#	backends/imgui_impl_sdl3.cpp
#	imgui.cpp
2025-05-19 18:48:22 +02:00
ocornut
6d939fcedc (Breaking) TreeNode: renamed ImGuiTreeNodeFlags_NavLeftJumpsBackHere to ImGuiTreeNodeFlags_NavLeftJumpsToParent for clarity. (#1079, #8639) 2025-05-15 17:35:29 +02:00
ocornut
1c8fad73f8 Merge branch 'master' into docking
# Conflicts:
#	backends/imgui_impl_sdlgpu3.cpp
#	backends/imgui_impl_vulkan.cpp
#	backends/imgui_impl_win32.cpp
2025-05-07 15:24:46 +02:00
ocornut
afd3a36f69 Demo: added basic Fonts section under main demo (same as Metrics one) for visibility. 2025-05-05 19:39:56 +02:00
ocornut
3f8033324f Demo: Dual List Box: fix sorting function, in theory should return 0 when equal. (#8601) 2025-04-30 11:10:58 +02:00
Ryan Jensen
b3c96bde8c Demo: use IM_ARRAYSIZE more consistently InputText calls in demo window (#8596) 2025-04-26 16:10:00 +02:00
Hinageshi
facf671eca Demo: rename DockingSplitterSize slider label to DockingSeparatorSize for consistency. (#8579) 2025-04-20 11:25:20 +02:00
ocornut
88d2df24be Merge branch 'master' into docking 2025-04-16 20:31:18 +02:00
ocornut
3ab50c334a TreeNode, Style: added style.TreeLinesRounding support. (#2920) 2025-04-10 19:26:29 +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
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
47d1ab192a Merge branch 'master' into docking
# Conflicts:
#	backends/imgui_impl_vulkan.cpp
#	imgui_widgets.cpp
2025-04-08 19:59:38 +02:00
ocornut
e5b218e6d1 TreeNode: added ImGuiTreeNodeFlags_DrawTreeXXX flags. (#2920)
# Conflicts:
#	docs/CHANGELOG.txt
2025-04-08 19:58:59 +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
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
ea2a12112d Misc: Various zealous warning fixes for newer version of Clang. 2025-03-14 17:13:11 +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
19d060cc26 Merge branch 'master' into docking
# Conflicts:
#	imgui.cpp
2025-03-05 20:33:16 +01:00
ocornut
fcec08f7ae Demo: (Refactor) Moved ExampleTreeNode contents below ShowDemoWindow() so main entry point is more visible to casual reader. 2025-03-05 13:39:48 +01:00
ocornut
324172fb1f Demo: (Refactor) Moved DemoWindowWidgets() below the functions it calls, reducing amount of forward declarations. 2025-03-05 13:35:14 +01:00
ocornut
935938bbd9 Merge branch 'master' into docking
# Conflicts:
#	backends/imgui_impl_glfw.cpp
2025-03-03 18:57:42 +01:00
ocornut
71b160cdbb Demo: (Refactor) Moved code into DemoWindowWidgetsDisableBlocks() section. 2025-03-03 18:56:21 +01:00
ocornut
7a919e80c9 Demo: (Refactor) Moved code into DemoWindowWidgetsQueryingStatuses() section. 2025-03-03 18:54:02 +01:00
ocornut
0758594bd2 Demo: (Refactor) Moved code into DemoWindowWidgetsDragAndDrop() section. 2025-03-03 18:54:01 +01:00
ocornut
9b486e47fe Demo: (Refactor) Moved code into DemoWindowWidgetsDragsAndSliders(), DemoWindowWidgetsMultiComponents(), DemoWindowWidgetsVerticalSliders() sections. 2025-03-03 18:47:11 +01:00
ocornut
caf3faa054 Demo: (Refactor) Moved code into DemoWindowWidgetsColorAndPickers() section. 2025-03-03 18:46:44 +01:00
ocornut
510a9a77d6 Demo: (Refactor) Moved code into DemoWindowWidgetsDataTypes() section. 2025-03-03 18:46:44 +01:00
ocornut
4d0c776a80 Demo: (Refactor) Moved code into DemoWindowWidgetsPlotting(), DemoWindowWidgetsProgressBars(), DemoWindowWidgetsTabs() sections. 2025-03-03 18:46:44 +01:00
ocornut
4450d61ac2 Demo: (Refactor) Moved code into DemoWindowWidgetsSelectables(), DemoWindowWidgetsTextFilter(), DemoWindowWidgetsTextInputs() sections. 2025-03-03 18:46:44 +01:00
ocornut
22baec494b Demo: (Refactor) Moved code into DemoWindowWidgetsComboBoxes(), DemoWindowWidgetsImages(), DemoWindowWidgetsListBoxes() sections. 2025-03-03 18:46:44 +01:00
ocornut
94877a137d Demo: (Refactor) Moved code into DemoWindowWidgetsBullets(), DemoWindowWidgetsCollapsingHeaders(), DemoWindowWidgetsCollapsingText() sections. 2025-03-03 18:46:44 +01:00
ocornut
de3f68a233 Demo: (Refactor) Moved code into DemoWindowWidgetsTooltips(), DemoWindowWidgetsTreeNodes() sections. 2025-03-03 18:46:44 +01:00
ocornut
b2c55c9db5 Demo: (Refactor) Moved code into DemoWindowWidgetsBasic() section. 2025-03-03 18:46:44 +01:00
ocornut
eefd2da0f6 Demo: (Refactor) Added new empty sections.. Renamed existing helper functions. 2025-03-03 18:46:43 +01:00
ocornut
15b96fd051 Merge branch 'master' into docking
# Conflicts:
#	imgui.cpp
#	imgui_internal.h
2025-02-27 22:01:51 +01:00