 4Benj_
|
33ba370809
|
Merge remote-tracking branch 'upstream/docking' into docking
|
3 years ago |
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
|
3 years ago |
|
ocornut
|
fd06ed833b
|
Misc: tweaks + fix warnings on backends withtout -wno-memaccess (#4995, #5104)
|
3 years ago |
|
ocornut
|
7b0d58c5e5
|
Merge branch 'master' into docking
|
3 years ago |
TheCherno
|
972d43347c
|
Merged from imgui/docking (1e14cc5) (v1.87 + some fixes)
|
3 years ago |
|
ocornut
|
5659db5529
|
IO: Fixed backward-compatibility accesses to io.KeysDown[]. (#4921, #4858)
+ Snuck in unrelated comments and removed the "fill once" comment (#5043)
|
3 years ago |
|
ocornut
|
dca527be1b
|
Clipper: Assert on extraneous calls to Step(). (#4822) + Demo tweak.
|
3 years ago |
|
ocornut
|
9948535118
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
# imgui.h
# imgui_draw.cpp
|
3 years ago |
|
ocornut
|
88de982071
|
Version 1.88 WIP
|
3 years ago |
|
ocornut
|
1ee252772a
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
|
3 years ago |
|
ocornut
|
c71a50deb5
|
Version 1.87
|
3 years ago |
|
ocornut
|
d5f0d45ae4
|
Merge branch 'master' into docking + remove two _PopUnusedDrawCmd() from docking branch, following 718daa1
# Conflicts:
# backends/imgui_impl_glfw.cpp
# backends/imgui_impl_sdl.cpp
# backends/imgui_impl_win32.cpp
# imgui.cpp
# imgui_internal.h
|
3 years ago |
|
ocornut
|
8555335935
|
Shallow alignment of ImGuiKey stuff + moving some in internals. Internals: add offset to ImBitArray<>, simpify ActiveIdUsingKeyInputMask.
|
3 years ago |
|
ocornut
|
b17b2fb732
|
Popups: Fixed an issue when reopening a same popup multiple times would offset them by 1 pixel on the right. (#4936)
Passing explicit ImGuiPopupFlags_MouseButtonRight to OpenPopupOnItemClick() calls somehow document the unusual (due to legacy) default value.
|
3 years ago |
thedmd
|
c2db4c2462
|
Demo: draw a section of keyboard in "Inputs > Keyboard, Gamepad & Navigation state" to visualize keys.
|
3 years ago |
|
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
|
3 years ago |
|
ocornut
|
39c3412f91
|
Backends: SDL: Add full gamepad support using io.AddKeyEvent(), io.AddKeyAnalogEvent(), stopped writing to io.NavInputs[]. (#4858, #787)
|
3 years ago |
|
ocornut
|
f33bb99821
|
IO: added AddKeyAnalogEvent() and support for ImGuiKey_GamepadXXXX. (#4858, #787)
|
3 years ago |
|
ocornut
|
7ad42ff431
|
IO: renamed io.ConfigInputEventQueue to io.ConfigInputTrickleEventQueue. (#4858)
|
3 years ago |
|
ocornut
|
97b1ffcb3b
|
IO: Reorder enums, compact a little in header. Removed const from internal GetKeyData().
|
3 years ago |
|
ocornut
|
91ae56af45
|
Removed support for legacy arithmetic operators (+*/) when inputing text into a slider/drag. (#4917, #3184)
|
3 years ago |
|
ocornut
|
8567a4cca3
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_glfw.cpp
# backends/imgui_impl_sdl.cpp
# backends/imgui_impl_win32.cpp
# imgui_demo.cpp
# imgui_internal.h
|
3 years ago |
|
ocornut
|
7374b96f5c
|
IO: Added input queue. (#4858, #2787, #1992, #3383, #2525, #1320)
|
3 years ago |
|
ocornut
|
eb823655af
|
Removed support for pre-C++11 compilers. We'll stop supporting VS2010. (#4537)
Build all
|
3 years ago |
|
ocornut
|
0647ba3bad
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_glfw.cpp
# backends/imgui_impl_osx.h
# backends/imgui_impl_osx.mm
# backends/imgui_impl_sdl.cpp
# backends/imgui_impl_win32.cpp
|
3 years ago |
Bertie Wheen
|
96186a93b9
|
Typo correction in imgui_demo.cpp (#4892)
|
3 years ago |
|
ocornut
|
ef681e7019
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_glfw.cpp
# backends/imgui_impl_glfw.h
# backends/imgui_impl_osx.h
# backends/imgui_impl_osx.mm
# backends/imgui_impl_sdl.cpp
# backends/imgui_impl_sdl.h
# backends/imgui_impl_win32.cpp
# backends/imgui_impl_win32.h
# imgui.cpp
|
3 years ago |
|
ocornut
|
bf08c13e9b
|
Inputs: Extra Keys / AddKeyEvent(): bidirectional mapping, basic CI, simplify backends, asserts on misuses, tested backward compat. (#2625, #4858, #2787)
(edit: simplified backends merged into previous commits to make history clearer)
|
3 years ago |
|
thedmd
|
3b66929301
|
Inputs: Extra Keys / AddKeyEvent(): Added ImGuiKey values, io.AddKeyEvent(), GetKeyName(), IMGUI_DISABLE_OBSOLETE_KEYIO. Obsoleted GetKeyIndex(), io.KeyMap[], io.KeysDown[]. (#2625, #4858, #2787)
|
3 years ago |
|
ocornut
|
2aa9959553
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_glfw.cpp
# backends/imgui_impl_opengl3.cpp
# docs/CHANGELOG.txt
|
3 years ago |
|
ocornut
|
89a28209e8
|
Version 1.87 WIP + Backends: OpenGL3: Fixed a buffer overflow in imgui_impl_opengl3_loader.h init, added in 1.86 (#4468, #4830)
|
3 years ago |
|
ocornut
|
15b4a064f9
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_win32.cpp
# examples/example_marmalade/main.cpp
# imgui.cpp
# imgui.h
|
3 years ago |
|
ocornut
|
512c54bbc0
|
Version 1.86
|
3 years ago |
|
ocornut
|
cd36acc88b
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_opengl3.cpp
# backends/imgui_impl_osx.h
# backends/imgui_impl_osx.mm
# imgui.cpp
|
3 years ago |
|
ocornut
|
48f263336b
|
Menus: fixed closing a menu inside a popup/modal. Fixed menu inside a popup/modal not inhibiting hovering of items in the popup/modal. (#3496, #4797)
Fixed sub-menu items inside a popups from closing the popup (debatable).
|
3 years ago |
|
ocornut
|
06e4f4e370
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_sdlrenderer.cpp
# backends/imgui_impl_sdlrenderer.h
# imgui.cpp
# imgui.h
|
3 years ago |
|
ocornut
|
78c6435dbb
|
Inputs: (breaking wip) removed IsMouseTripleClicked() added recently (during 1.86 WIP), replaced with GetMouseClickedCount(). (#3229)
|
3 years ago |
|
ocornut
|
848d21b6b5
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_sdlrenderer.cpp
# backends/imgui_impl_sdlrenderer.h
# imgui.cpp
# imgui_widgets.cpp
|
3 years ago |
|
ocornut
|
c5db276521
|
InputText, Nav: fixed tabbing through InputTextMultiline(). (#4761, #3092)
Messy... Broken by 66f0fb9. Added ImGuiItemFlags_NoTabStop to EndGroup() ahead of time (not strictly needed here).
|
3 years ago |
|
ocornut
|
dc8c3618e8
|
Merge branch 'master' into docking
# Conflicts:
# imgui_demo.cpp
|
3 years ago |
Pascal Thomet
|
7cd3cfa58a
|
Demo: Add IMGUI_DEMO_MARKER (currently unused, but usage by altering GImGuiDemoMarkerCallback) (#3689)
Various amends/renames. (Amend to fix a warning)
|
3 years ago |
|
ocornut
|
8ce23b3ccd
|
Nav: Ctrl+tabbing to cycle through windows is now enabled regardless of _NavEnableKeyboard. (#4023, #767)
|
3 years ago |
|
ocornut
|
0b4edf4e94
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_vulkan.cpp
# imgui.cpp
|
3 years ago |
|
ocornut
|
0f2898ea88
|
Demo: Tree selection demo use !IsItemToggledOpen() (#1896) + update FAQ (#4366)
|
3 years ago |
|
ocornut
|
9c78fc928a
|
Inputs: Mouse: Amend c8e3a01 for tracking multiple clicks, renaming. (#3229)
|
3 years ago |
Chris Savoie
|
2318c764cf
|
Inputs: Mouse: Add support for tracking multiple clicks more than just double (#3229)
|
3 years ago |
|
ocornut
|
9b59455184
|
Merge branch 'master' into docking
# Conflicts:
# imgui.h
|
3 years ago |
|
ocornut
|
e3bd9434b1
|
1.86 WIP + internals: tweaks table temp data code.
|
3 years ago |
|
ocornut
|
29653273c1
|
Docking: reinstate io.ConfigDockingWithShift option. (#4643)
This more or less reverts commit 3ed07a8f0b.
|
3 years ago |
|
ocornut
|
1b215ecb01
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
|
3 years ago |