246 commits

Author	SHA1	Message	Date
ocornut	5e462eb29b	Merge branch 'master' into docking ... # Conflicts: # backends/imgui_impl_glfw.cpp	2025-11-18 19:20:08 +01:00
ocornut	eb19a77848	Examples: fix example_null Makefile. ... Amend b885382	2025-11-17 15:52:32 +01:00
ocornut	8c6096fcfe	Merge branch 'master' into docking	2025-09-12 15:05:55 +02:00
ocornut	78c1d4a92c	InputText: Word-Wrap: moving ImGuiInputTextFlags_WordWrap to public API. Added in demo. (#3237, #952, #1062, #7363)	2025-09-12 15:03:33 +02:00
ocornut	adfa5364cd	Merge branch 'master' into docking ... # Conflicts: # backends/imgui_impl_sdlgpu3.cpp # imgui.cpp	2025-06-25 18:27:19 +02:00
ocornut	d8c6953710	Fonts: comments.	2025-06-25 12:10:13 +02:00
ocornut	e4bba0b53c	Merge branch 'master' into docking	2025-06-24 19:10:26 +02:00
ocornut	97e0d59619	(Breaking) Fonts: removed PushFontSize(), PopFontSize().	2025-06-24 19:09:51 +02:00
ocornut	c2c38beec8	Merge branch 'master' into docking ... # Conflicts: # backends/imgui_impl_glfw.cpp # backends/imgui_impl_glfw.h	2025-06-18 16:55:20 +02:00
ocornut	344d5ff4b7	Merge branch 'master' into docking	2025-06-17 20:15:12 +02:00
ocornut	f2e4e80391	Windows: BeginChild(): fixed being unable to combine manual resize on one axis and automatic resize on the other axis. (#8690) ... + removed obsolete TODO entries.	2025-06-17 14:01:01 +02: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	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
Tygyh	74afea04d6	Fix typos in docs (#8427)	2025-02-22 23:36:40 +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
fdsa	4f1d3809c3	Fixed tabs and spaces (#8377)	2025-02-06 19:54:43 +01:00
ocornut	4e2126ee44	Merge branch 'master' into docking ... # Conflicts: # docs/CHANGELOG.txt # imgui.cpp # imgui.h # imgui_demo.cpp # imgui_widgets.cpp	2024-10-18 18:59:27 +02:00
ocornut	ab9ce2a927	Nav: added io.ConfigNavCursorVisibleAuto, io.ConfigNavCursorVisibleAlways. (#1074, #2048, #7237, #8059, #3200, #787) ... Note: the NavCursorHideFrames addition is to support 88a354585 even though ConfigNavCursorVisibleAlways is set.	2024-10-18 18:54:46 +02:00
ocornut	7a56b41124	Nav: added io.ConfigNavEscapeClearFocusItem. (#8059, #2048, #1074, #3200)	2024-10-18 18:49:43 +02:00
ocornut	514a97a9b7	Merge branch 'master' into docking ... # Conflicts: # backends/imgui_impl_dx11.cpp # backends/imgui_impl_dx11.h # backends/imgui_impl_dx12.cpp # backends/imgui_impl_dx12.h # backends/imgui_impl_glfw.cpp # backends/imgui_impl_sdlrenderer2.cpp # backends/imgui_impl_sdlrenderer2.h # backends/imgui_impl_sdlrenderer3.cpp # backends/imgui_impl_sdlrenderer3.h # backends/imgui_impl_vulkan.cpp # backends/imgui_impl_vulkan.h # backends/imgui_impl_wgpu.cpp # backends/imgui_impl_wgpu.h # backends/imgui_impl_win32.cpp # imgui.cpp # imgui_demo.cpp	2024-10-14 19:23:23 +02:00
ocornut	98d52b7b26	DrawList: AddCallback() added an optional size parameter allowing to copy and store any amount of user data for usage by callbacks: (#6969, #4770, #7665)	2024-10-11 13:29:13 +02:00
ocornut	8326dabe5e	Merge branch 'master' into docking	2024-09-12 23:19:26 +02:00
ocornut	8807b01b28	InputText: amends: now can use memchr()/strchr() for line counting. Much faster! (#7925)	2024-09-11 14:46:29 +02:00
ocornut	fed4841bd4	Merge branch 'master' into docking ... # Conflicts: # backends/imgui_impl_glfw.cpp # backends/imgui_impl_osx.mm # backends/imgui_impl_sdl2.cpp # backends/imgui_impl_sdl3.cpp # imgui.cpp # imgui.h # imgui_internal.h	2024-08-22 20:26:59 +02:00
ocornut	5de7f69cbb	(BREAKING) Commented out obsolete ImageButton(). (#5533, #4471, #2464, #1390)	2024-08-22 20:12:23 +02:00
ocornut	bf75504d7a	Style: added PushStyleVarX(), PushStyleVarY() helpers to modify only one component of a ImVec2 var. ... + tweak existing function to early out on error.	2024-08-22 13:55:42 +02:00
ocornut	fdc084f532	Merge branch 'master' into docking	2024-06-03 19:08:37 +02:00
ocornut	109a8632d7	Combo: simplified Combo() API uses a list clipper. ... Wasn't as trivial before supporting IncludeItemByIndex().	2024-05-28 18:24:01 +02:00
ocornut	222dd775fc	Merge branch 'master' into docking ... # Conflicts: # imgui.cpp # imgui.h # imgui_internal.h	2024-05-28 17:11:57 +02:00
ocornut	1f9fc382c3	Version 1.90.8 WIP ... Tidying up todo.txt	2024-05-28 10:09:31 +02:00
ocornut	fee0210592	Merge branch 'master' into docking	2024-05-24 16:09:29 +02:00
ocornut	16b72f2d21	Comments	2024-05-24 14:21:50 +02:00
ocornut	72ebd91567	Merge branch 'master' into docking ... # Conflicts: # backends/imgui_impl_opengl3.cpp # imgui.h	2023-10-05 15:10:45 +02:00
ocornut	2c07d581de	TreeNode: Added ImGuiTreeNodeFlags_SpanAllColumns for use in tables. (#3151, #3565, #2451, #2438)	2023-10-05 15:05:58 +02:00
ocornut	28b237f94d	Separator(): Altered end-points to use more standard boundaries. (#205, #4787, #1643, #759)	2023-10-03 15:26:35 +02:00
ocornut	677c7b2258	Merge branch 'master' into docking ... # Conflicts: # backends/imgui_impl_vulkan.cpp # docs/CHANGELOG.txt # docs/TODO.txt	2023-07-04 14:58:03 +02:00
ocornut	655aae5911	Comments + docs: tidying up todo list + demo tweak for tooltips.	2023-06-30 14:58:49 +02:00
ocornut	a02315e1c4	Combo: Made simple/legacy Combo() function not returns true when picking already selected item. (#1182)	2023-06-28 15:47:10 +02:00
ocornut	aec062a8a5	Merge branch 'master' into docking ... # Conflicts: # backends/imgui_impl_osx.mm # backends/imgui_impl_sdl2.cpp # backends/imgui_impl_sdl3.cpp # docs/CHANGELOG.txt # examples/example_win32_directx9/main.cpp # imgui_internal.h	2023-04-11 16:16:17 +02:00
Michael Martz	506f7e0074	Using nullptr in locations where warning disable is not convenient. (#6313, #4537)	2023-04-11 11:33:50 +02:00
ocornut	3ea0fad204	Merge branch 'master' into docking ... # Conflicts: # docs/CHANGELOG.txt # imgui.cpp # imgui.h	2022-12-01 20:22:27 +01:00
ocornut	1a497c2499	Inputs, IO: reworked ImGuiMod_Shortcut to redirect to Ctrl/Super at runtime instead of compile-time. (#5923, #456)	2022-11-29 19:07:50 +01:00
ocornut	e135cdbc24	Merge branch 'master' into docking + update for IMGUI_DEBUG_LOG calls. ... # Conflicts: # backends/imgui_impl_dx12.cpp # imgui.cpp # imgui_internal.h	2022-06-15 15:39:23 +02:00
ocornut	2ed9e21eba	Nav, Internals: wrap changes to g.NavWindow into a helper function to help track/log changes. ... Amend 076d8fc. Eventually we should REALLY clean up the SetNavWindow SetNavID SetFocusID FocusWindow fiasco.	2022-06-13 19:05:55 +02:00
ocornut	8dd5425182	Merge branch 'master' into docking ... # Conflicts: # docs/TODO.txt	2022-04-22 19:15:37 +02:00
ocornut	28b2089ee4	Internals: moved ItemSize() variant to inline + comment. + Tidying up todo list (#5191)	2022-04-13 21:48:21 +02:00
ocornut	3e0d6ec895	Merge branch 'master' into docking ... # Conflicts: # backends/imgui_impl_glfw.cpp # backends/imgui_impl_sdl.cpp # backends/imgui_impl_vulkan.cpp # backends/imgui_impl_vulkan.h # backends/imgui_impl_win32.cpp # imgui.cpp # imgui.h # imgui_demo.cpp # imgui_internal.h	2022-01-21 12:39:15 +01:00
ocornut	91ae56af45	Removed support for legacy arithmetic operators (+*/) when inputing text into a slider/drag. (#4917, #3184)	2022-01-19 15:10:42 +01:00
ocornut	dc8c3618e8	Merge branch 'master' into docking ... # Conflicts: # imgui_demo.cpp	2021-11-10 15:26:03 +01:00