Cool_Tools/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2024-12-23 21:15:03 +01:00
Code Releases Wiki Activity
10,027 Commits 9 Branches 127 Tags 417 MiB
a9cd0f5e42
Commit Graph

1727 Commits

Author SHA1 Message Date
ocornut
a9cd0f5e42 Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_allegro5.cpp
#	backends/imgui_impl_allegro5.h
#	backends/imgui_impl_android.cpp
#	backends/imgui_impl_android.h
#	backends/imgui_impl_dx10.cpp
#	backends/imgui_impl_dx10.h
#	backends/imgui_impl_dx12.cpp
#	backends/imgui_impl_dx9.cpp
#	backends/imgui_impl_dx9.h
#	backends/imgui_impl_glfw.cpp
#	backends/imgui_impl_glfw.h
#	backends/imgui_impl_metal.h
#	backends/imgui_impl_metal.mm
#	backends/imgui_impl_opengl2.cpp
#	backends/imgui_impl_opengl2.h
#	backends/imgui_impl_opengl3.cpp
#	backends/imgui_impl_opengl3.h
#	backends/imgui_impl_sdl2.cpp
#	backends/imgui_impl_sdl2.h
#	backends/imgui_impl_sdl3.cpp
#	backends/imgui_impl_sdl3.h
#	backends/imgui_impl_vulkan.cpp
#	backends/imgui_impl_vulkan.h
#	backends/imgui_impl_win32.cpp
#	backends/imgui_impl_win32.h
#	imgui.cpp
 2024-12-11 12:27:25 +01:00
ocornut
d78e823449 InputText: added ImGuiInputTextFlags_ElideLeft. (#1442, #1440, #4391, #7208, #8216) 2024-12-09 15:00:04 +01:00
ocornut
ff2d6815ef Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_dx9.cpp
#	backends/imgui_impl_dx9.h
#	backends/imgui_impl_vulkan.cpp
#	imgui.cpp
 2024-12-04 19:56:35 +01:00
Jack Holmes
6f6ac84228
Demo: Assets Browser: use correct axis for layout computation, to allow making items non-square. (#8207) 2024-12-04 18:59:51 +01:00
ocornut
cdf21f6773 Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_dx12.cpp
#	docs/CHANGELOG.txt
#	imgui.cpp
#	imgui_internal.h
 2024-11-21 14:52:04 +01:00
ocornut
eb0ad66d88 Demo: example tree used by Property Editor & Selection demos properly freed on app closure. (#8158) 2024-11-18 18:46:27 +01:00
ocornut
3381ab423b Version 1.91.6 WIP + fixed typo in tooltip. 2024-11-12 11:56:21 +01:00
ocornut
368123ab06 Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_metal.mm
#	imgui_draw.cpp
 2024-11-07 19:58:23 +01:00
ocornut
f401021d5a Version 1.91.5 2024-11-07 19:57:33 +01:00
ocornut
83660e37e3 Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_glut.cpp
#	backends/imgui_impl_glut.h
#	backends/imgui_impl_metal.mm
#	imgui.cpp
#	imgui_demo.cpp
 2024-11-06 17:58:35 +01:00
ocornut
6f287dd16d (Breaking) Removed pre-1.87 obsolete io.KeyMap[], io.KeysDown[], io.NavInputs[]. Remove IMGUI_DISABLE_OBSOLETE_KEYIO. (#4921) 2024-11-06 17:54:59 +01:00
ocornut
be2d006e2e Align warning blocks. Removed -Wunused-function, -Wmissing-prototypes from imgui_internal.h 
As supposedly they were for stb_textedit.h which is now moved to imgui_draw.cpp
 2024-11-05 10:50:49 +01:00
ocornut
71c77c081a Demo: added a "Windows" section. 2024-10-30 15:41:45 +01:00
ocornut
772ca9e9a9 Log/Capture: added experimental io.ConfigWindowsCopyContentsWithCtrlC config option. 2024-10-30 15:38:58 +01:00
ocornut
9d6ec825cb Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_win32.cpp
 2024-10-28 17:27:38 +01:00
ocornut
81cfe09657 Selectable, Style: selected Selectable() use _Header color instead of an arbitrary lerp between _Header and _HeaderHovered. (#8106, #1861) 2024-10-28 15:45:46 +01:00
ocornut
942b64abfc Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_dx12.cpp
#	backends/imgui_impl_sdl2.cpp
#	backends/imgui_impl_sdl3.cpp
 2024-10-24 18:15:51 +02:00
ocornut
41f02825fc Version 1.91.5 WIP 2024-10-23 12:16:28 +02:00
ocornut
c71e4e8c7c Merge branch 'master' into docking 2024-10-18 22:04:08 +02:00
ocornut
83b64b8be2 Version 1.91.4 2024-10-18 21:45:36 +02: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
3982cb35dc Nav, Docs: consistently use "keyboard/gamepad" instead of sometimes "gamepad/keyboard". 2024-10-18 18:49:44 +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
b001038901 Nav: added io.ConfigNavEscapeClearFocusWindow to clear focused window on Escape. (#3200) 
+ pressing escape to hide nav highlight doesn't clear location from when ctrl+tabbing back into same window later.
 2024-10-14 16:57:34 +02:00
ocornut
ba5161740e Amend d885fe4, fixes default value of ConfigNavCaptureKeyboard. (#2517, #2009) 2024-10-14 16:52:25 +02:00
ocornut
d885fe4dd0 (Breaking) moved ImGuiConfigFlags_NavEnableSetMousePos -> io.ConfigNavMoveSetMousePos, ImGuiConfigFlags_NavNoCaptureKeyboard -> ConfigNavCaptureKeyboard. (#2517, #2009) 2024-10-14 15:29:24 +02:00
ocornut
fa9277d12d Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_dx10.cpp
#	backends/imgui_impl_dx11.cpp
#	backends/imgui_impl_dx11.h
#	backends/imgui_impl_dx12.cpp
#	backends/imgui_impl_dx12.h
#	backends/imgui_impl_dx9.cpp
#	backends/imgui_impl_opengl2.cpp
#	backends/imgui_impl_opengl3.cpp
#	backends/imgui_impl_vulkan.cpp
#	backends/imgui_impl_vulkan.h
#	backends/imgui_impl_wgpu.cpp
#	backends/imgui_impl_wgpu.h
#	imgui.h
 2024-10-07 22:05:57 +02:00
ocornut
1dde20ff4a Version 1.91.4 WIP 2024-10-07 17:39:28 +02:00
ocornut
b4c96355c9 Merge branch 'master' into docking 
# Conflicts:
#	imgui.cpp
 2024-10-04 15:43:05 +02:00
ocornut
cb16568fca Version 1.91.3 2024-10-04 15:42:45 +02:00
ocornut
b3c87475a5 Drags, Slider: added ImGuiSliderFlags_ClampOnInput, ImGuiSliderFlags_ClampZeroRange. (#7968, #3361, #76) 2024-10-03 16:26:44 +02:00
ocornut
793773209b Comments. Fixed warnings. 2024-09-27 19:37:48 +02:00
ocornut
ba14c70b02 Comments. Fixed warnings. 2024-09-27 19:28:54 +02:00
ocornut
d1ea03b872 Merge branch 'master' into docking 
# Conflicts:
#	imgui.cpp
#	imgui_internal.h
 2024-09-27 19:03:25 +02:00
ocornut
30c29d291f Error Handling: enabled experimental recovery systems. (#1651, #5654) 
Setup a couple of features to configure them, including ways to display error tooltips instead of assserting.
 2024-09-27 19:00:56 +02:00
ocornut
797101a882 Windows: BeginChild(): made it possible to call SetNextWindowSize() on a child window using ImGuiChildFlags_ResizeX/ImGuiChildFlags_ResizeY. (#1710, #8020) 2024-09-26 14:58:56 +02:00
ocornut
10fe2b674a Merge branch 'master' into docking 2024-09-20 18:43:48 +02:00
ocornut
fb410463e6 Scrollbar: added io.ConfigScrollbarScrollByPage setting. (#8002, #7328) 2024-09-20 18:40:32 +02:00
ocornut
faca859043 Version 1.91.3 WIP 2024-09-19 15:51:06 +02:00
ocornut
bc77cccd31 Merge branch 'master' into docking 2024-09-19 14:52:43 +02:00
ocornut
a9f72ab681 Version 1.91.2 2024-09-19 14:47:13 +02:00
ocornut
ae8688974b Merge branch 'master' into docking 2024-09-17 21:08:03 +02:00
ocornut
dab63231d8 Misc: Made it accepted to call SetMouseCursor() with any out-of-bound value, as a way to allow hacking in custom cursors if desirable. 2024-09-16 11:19:05 +02:00
ocornut
68aa9a86ec Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_sdl2.cpp
 2024-09-10 16:29:14 +02:00
ocornut
67cd4ead65 Added io.ConfigDebugHighlightIdConflicts debug feature! (#7961, #7669) 
Also #74, #96, #480, #501, #647, #654, #719, #843, #894, #1057, #1173, #1390, #1414, #1556, #1768, #2041, #2116, #2330, #2475, #2562, #2667, #2807, #2885, #3102, #3375, #3526, #3964, #4008, #4070, #4158, #4172, #4199, #4375, #4395, #4471, #4548, #4612, #4631, #4657, #4796, #5210, #5303, #5360, #5393, #5533, #5692, #5707, #5729, #5773, #5787, #5884, #6046, #6093, #6186, #6223, #6364, #6387, #6567, #6692, #6724, #6939, #6984, #7246, #7270, #7375, #7421, #7434, #7472, #7581, #7724, #7926, #7937 and probably more.. Tagging to increase visibility!
 2024-09-10 15:40:37 +02:00
Pascal Thomet
a8eec24405 Demo: fix some id conflicts. (#7961) 2024-09-09 21:07:29 +02:00
ocornut
7694e89e89 Merge branch 'master' into docking 
# Conflicts:
#	imgui.cpp
 2024-09-09 16:54:40 +02:00
ocornut
193c1e2366 Version 1.91.2 WIP 2024-09-05 20:03:23 +02:00