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 |
|
ocornut
|
55d35d8387
|
Version 1.85
|
3 years ago |
|
ocornut
|
1780579403
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
|
3 years ago |
|
ocornut
|
2de96c4bd5
|
Stack Tool: Added Stack Tool (ShowStackToolWindow() function and available from Demo and Metrics window). (#4631)
|
3 years ago |
|
ocornut
|
65ad63de84
|
Added ImGuiFocusedFlags_NoPopupHierarchy and ImGuiHoveredFlags_NoPopupHierarchy (followup #4527)
IsWindowFocused: fix flag usage (amend 6b1e094c) was technically harmless because of light typing.
|
3 years ago |
|
ocornut
|
fc4988ffb0
|
Added ImGuiFocusedFlags_NoPopupHierarchy and ImGuiHoveredFlags_NoPopupHierarchy (followup #4527)
|
3 years ago |
|
ocornut
|
c58fb46411
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui.h
|
3 years ago |
|
ocornut
|
7b8bc864e9
|
Menus: Fixed vertical alignments of MenuItem() calls within a menu bar. (broken by f8fae022). (#4538)
|
3 years ago |
|
ocornut
|
6b1e094cfb
|
Fixed _ChildWindows from leaking docking hierarchy. Added ImGuiFocusedFlags_DockHierarchy and ImGuiHoveredFlags_DockHierarchy.
|
3 years ago |
|
ocornut
|
fa9fc05ac6
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
|
3 years ago |
Filippo Crocchini
|
eb6c16d3dd
|
PlotHistogram: Fixed zero-line position when manually specifying min<0 and max>0. (#4349)
+ amended demo tweaks by ocornut
|
3 years ago |
|
ocornut
|
dedb381c51
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_opengl3.cpp
# examples/imgui_examples.sln
# imgui.cpp
# imgui.h
|
3 years ago |
|
ocornut
|
4aea1c5adb
|
IO: added io.WantCaptureMouseAllowPopupClose (#4480) + comments
|
3 years ago |
|
ocornut
|
e23bee353c
|
Removed GetWindowContentRegionWidth() function
|
3 years ago |
|
ocornut
|
0649f750b4
|
Version 1.85 WIP
|
3 years ago |
|
ocornut
|
5a7d18a441
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
|
3 years ago |
|
ocornut
|
d2ffbd9b86
|
Version 1.84
Fix PVS Studio false positive //-V1020
Fix missing #ifndef for IMGUI_IMPL_OPENGL_LOADER_CUSTOM path
|
3 years ago |
|
ocornut
|
c543d93af1
|
Expose BeginDisabled()/EndDisabled() in public API. Add to demo. (#211)
|
3 years ago |
|
ocornut
|
0b06c4b2b0
|
Merge branch 'master' into docking (will need further for io.AddFocusEvent)
# Conflicts:
# backends/imgui_impl_glfw.cpp
# backends/imgui_impl_opengl3.cpp
# backends/imgui_impl_sdl.cpp
# backends/imgui_impl_win32.cpp
# imgui.cpp
|
3 years ago |
|
ocornut
|
b380d3abe3
|
Backends: OpenGL3: Clarify use of GL_POLYGON_MODE.
|
3 years ago |
|
ocornut
|
a11f36811f
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_dx10.cpp
# backends/imgui_impl_dx11.cpp
# backends/imgui_impl_dx12.cpp
# backends/imgui_impl_dx9.cpp
# backends/imgui_impl_glfw.cpp
# backends/imgui_impl_opengl3.cpp
# backends/imgui_impl_sdl.cpp
# backends/imgui_impl_vulkan.cpp
# backends/imgui_impl_win32.cpp
# imgui.cpp
# imgui_internal.h
|
4 years ago |
|
ocornut
|
ba1c8464ef
|
Internals: Removed ImGuiButtonFlags_Disabled (which had inconsistent behavior) in favor of ImGuiItemFlags_Disabled. Selectable()'s ImGuiSelectableFlags_Disabled now uses the later. (#211)
|
4 years ago |