Cool_Tools/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2024-12-11 23:46:06 +01:00
Code Releases Wiki Activity
8,199 Commits 9 Branches 127 Tags 318 MiB
6fd2ee9416
Commit Graph

1283 Commits

Author SHA1 Message Date
ocornut
6fd2ee9416 Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_sdl.cpp
#	imgui_demo.cpp
 2022-09-26 14:57:34 +02:00
ocornut
c261dac02f Demo: moved ShowUserGuide() lower in the file, to make main demo entry point more visible + fix using IMGUI_DEBUG_LOG() macros in if/else. 2022-09-26 14:56:36 +02:00
ocornut
1dc7d0e633 Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_glfw.cpp
#	backends/imgui_impl_osx.mm
#	backends/imgui_impl_sdl.cpp
#	backends/imgui_impl_win32.cpp
#	imgui.cpp
 2022-09-26 11:08:49 +02:00
ocornut
85f327d8d3 InputText: added ImGuiInputTextFlags_EscapeClearsAll (#5688) 2022-09-21 16:23:44 +02:00
ocornut
4b522e145c Experiment: ImGuiKey is now a typed enum, allowing ImGuiKey_XXX symbols to be named in debuggers. (#4921, #4537) 
May affect binding generators.
 2022-09-20 12:42:29 +02:00
ocornut
3af9ac320d Merge branch 'master' into docking 
# Conflicts:
#	examples/imgui_examples.sln
#	imgui.cpp
#	imgui.h
#	imgui_demo.cpp
 2022-09-17 00:25:42 +02:00
tocic
2b1d8e3eaf Fix more typos in sources and docs (#5681) 2022-09-14 20:36:45 +02:00
ocornut
44e3ba115a Demo: moved "Mouse Cursors" section. moved "Filtering" section. 2022-09-14 20:18:23 +02:00
tocic
6c3c9cea7f Fix typos in source comments (#5675) 2022-09-13 11:09:34 +02:00
ocornut
bc2002ab92 Merge branch 'master' into docking 2022-09-01 20:54:37 +02:00
ocornut
2569c64740 Demo: Improved "Constrained-resizing window" example, more clearly showcase aspect-ratio. (#5627, #5618) 2022-09-01 11:13:39 +02:00
ocornut
e13913ed57 IsItemHovered: Added ImGuiHoveredFlags_DelayNormal, ImGuiHoveredFlags_DelayShort, ImGuiHoveredFlags_NoSharedDelay. (#1485) 
IsItemHovered() can't have a non-zero default, but higher-level tooltip helpers may enable a different default later.
 2022-08-24 21:32:13 +02:00
ocornut
db798fd5be Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_metal.mm
#	imgui.cpp
#	imgui_internal.h
 2022-08-23 18:41:24 +02:00
ocornut
ef6ba0d846 Misc: allowing override of IM_TABSIZE (#5593) 2022-08-20 19:54:57 +02:00
ocornut
e9f50fb87c Merge branch 'master' into docking 
# Conflicts:
#	imgui.cpp
 2022-08-03 22:04:03 +02:00
ocornut
4a2ae06ca4 Changed signature of ImageButton() function: Added 'const char* str_id' parameter + removed 'int frame_padding = -1' parameter. (#5533, #4471, #2464, #1390). 
Also removed frame_padding parameter from ImageButtonEx(), amend e0ec69d8.
 2022-08-03 21:04:33 +02:00
ocornut
21fc57f2cf Merge branch 'master' into docking 2022-07-08 16:09:30 +02:00
ocornut
8b8a61bdf9 Removed io.NavInputs[] and ImGuiNavInput enum. Kept inline redirection code. (#4921, #4858, #787, #1599, #323) 2022-07-08 16:02:07 +02:00
ocornut
a7a25ee19d Tools: Item Picker: Mouse button can be changed by holding Ctrl+Shift. (#2673) 2022-07-07 14:18:08 +02:00
ocornut
92d0924b82 Fixed build with IMGUI_DISABLE_OBSOLETE_KEYIO + made all examples comments refer to StyleColorsLight(). 2022-07-06 20:58:20 +02:00
ocornut
5d0deebba4 Merge branch 'master' into docking 
# Conflicts:
#	docs/CHANGELOG.txt
 2022-06-30 20:17:48 +02:00
ocornut
609b935a8c InputText: added experimental io.ConfigInputTextEnterKeepActive feature to make pressing Enter keep the input active and select all text. 2022-06-30 15:47:54 +02:00
ocornut
24dfe6db8a Version 1.89 WIP 2022-06-27 16:55:55 +02:00
ocornut
9cd9c2eff9 Merge branch 'master' into docking 
# Conflicts:
#	docs/CHANGELOG.txt
#	imgui.cpp
#	imgui_widgets.cpp
 2022-06-21 18:28:33 +02:00
ocornut
9aae45eb4a Version 1.88 
(fix "Show Debug Log" checkbox in Metrics window)
 2022-06-21 18:11:50 +02:00
ocornut
07efd7cc20 Renamed IMGUI_DISABLE_METRICS_WINDOW to IMGUI_DISABLE_DEBUG_TOOLS. 2022-06-15 16:02:55 +02: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
1d6e34f3f9 Debug: Added ShowDebugLogWindow(). 
Internal: renamed old IMGUI_DEBUG_LOG() to IMGUI_DEBUG_PRINT().
Amended once.
 2022-06-13 19:05:55 +02:00
ocornut
e900ca355e Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_metal.mm
#	imgui.cpp
#	imgui.h
 2022-06-10 19:29:17 +02:00
Rokas Kupstys
0b1bcfcc20 Menus: Separate menu sets by nav layer. (#3496, #4797) + Demo: Remove incorrect and useless suggestion to use PushID(). 
Fixes a common case where opening menu in one nav layer and hovering a menu in another nav layer would open that menu without a click.
 2022-06-08 17:17:54 +02:00
ocornut
74f02703e6 Misc comments + Demo: use IsItemVisible() when using direct ImDrawList calls. 2022-06-07 11:48:05 +02:00
JJCUBER
17b8c3b6ea
Demo: Removed redundant window flag (#5367) 2022-06-02 14:32:43 +02:00
ocornut
7b5a8e4f2b Merge branch 'master' into docking (wanted for #4468, #3381, #2981, #4825, #4832, #5127) 
# Conflicts:
#	backends/imgui_impl_opengl3.cpp
 2022-05-30 15:26:12 +02:00
ocornut
ae2fb557f3 Docs: Update templates with link to Contributing guidelines. Add numerical version number in demo. Moved. (#5337) 2022-05-23 14:43:04 +02:00
ocornut
7bf07d2526 Renamed CaptureMouseFromApp() and CaptureKeyboardFromApp() to SetNextFrameWantCaptureMouse() and SetNextFrameWantCaptureKeyboard(). Added demo. (#5304, #4831, #4480, #533) 2022-05-23 11:22:46 +02:00
ocornut
8dd5425182 Merge branch 'master' into docking 
# Conflicts:
#	docs/TODO.txt
 2022-04-22 19:15:37 +02:00
ocornut
5b29d14783 Layout: Fixed mixing up SameLine() and SetCursorPos() together. SameLine() is a stateful. 
+ minor unrelatedcomments.
 2022-04-22 17:48:06 +02:00
ocornut
eda7792b15 Internals: swapped blocks in TextEx() to make it easier to step through common cases. Tweak demo. 2022-04-14 18:36:27 +02:00
David Maas
937d073328 Updated comment about Edit.NavigateTo to Edit.GoToAll. (#5179) 
This command was renamed in Visual Studio 2017.
 2022-04-11 17:11:51 +02:00
ocornut
505f19e3b0 Merge branch 'master' into docking 
# Conflicts:
#	imgui.cpp
#	imgui.h
#	imgui_internal.h
 2022-04-05 17:55:53 +02:00
ocornut
a472e8834b InputScalar: Automatically allow hexadecimal/scientific input when format is adequate. 2022-04-05 15:13:37 +02:00
ocornut
508c9aaf60 Sliders, Drags: Fixed using hexadecimal display format strings (pretty much never worked). (#5165, #3133) 
Ditched unnecessary code. When transitioning from float in 3e8087458 we added an unnecessary path there, which evolved in c5fb92955.
 2022-04-04 14:43:30 +02:00
ocornut
377b864bb4 Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_dx12.cpp
#	backends/imgui_impl_glfw.cpp
#	backends/imgui_impl_sdl.cpp
#	imgui_internal.h
#	imgui_widgets.cpp
 2022-03-23 17:21:34 +01:00
ocornut
fd06ed833b Misc: tweaks + fix warnings on backends withtout -wno-memaccess (#4995, #5104) 2022-03-13 17:57:32 +07:00
ocornut
7b0d58c5e5 Merge branch 'master' into docking 2022-02-22 14:57:17 +01:00
ocornut
5659db5529 IO: Fixed backward-compatibility accesses to io.KeysDown[]. (#4921, #4858) 
+ Snuck in unrelated comments and removed the "fill once" comment (#5043)
 2022-02-21 21:31:01 +01:00
ocornut
dca527be1b Clipper: Assert on extraneous calls to Step(). (#4822) + Demo tweak. 2022-02-18 18:40:43 +01:00
ocornut
9948535118 Merge branch 'master' into docking 
# Conflicts:
#	docs/CHANGELOG.txt
#	imgui.cpp
#	imgui.h
#	imgui_draw.cpp
 2022-02-17 18:47:43 +01:00
ocornut
88de982071 Version 1.88 WIP 2022-02-08 14:45:26 +01:00
ocornut
1ee252772a Merge branch 'master' into docking 
# Conflicts:
#	docs/CHANGELOG.txt
 2022-02-07 18:20:10 +01:00