omar
|
9f96fcff3c
|
Docking: Added ImGuiDockNodeFlags_Dockspace instead of node internal IsDockspace toward allowing the DockBuilder API to create non-dockspace nodes.
|
2019-01-23 19:24:34 +01:00 |
|
omar
|
0947fa3de0
|
Merge branch 'viewport' into docking
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
2019-01-21 16:54:37 +01:00 |
|
omar
|
cb9a6b8a8b
|
Merge branch 'master' into viewport
# Conflicts:
# examples/README.txt
# imgui.cpp
|
2019-01-21 16:52:22 +01:00 |
|
omar
|
f14f93ef6e
|
Fixed range-version of PushID() and GetID() not honoring the ### operator to restart from the seed value.
|
2019-01-21 16:50:27 +01:00 |
|
omar
|
f94af2f5c5
|
Merge branch 'viewport' into docking
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
# imgui_draw.cpp
|
2019-01-20 22:13:35 +01:00 |
|
omar
|
8079344cee
|
Merge branch 'master' into viewport
# Conflicts:
# examples/example_sdl_vulkan/main.cpp
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_dx12.cpp
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_sdl.cpp
# examples/imgui_impl_vulkan.h
# imgui.cpp
|
2019-01-20 22:12:06 +01:00 |
|
omar
|
2c38b32db1
|
Removed trailing spaces (#2038, #2299)
|
2019-01-20 17:56:17 +01:00 |
|
omar
|
f94ba546ba
|
Added checks for "zero-as-null-pointer-constant" warnings for older Clang (#2299, followup to #2277)
|
2019-01-20 17:46:00 +01:00 |
|
omar
|
e9c625a1dc
|
Merge branch 'master' into viewport
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_win32.cpp
# imgui_demo.cpp
|
2019-01-17 14:05:40 +01:00 |
|
omar
|
d1851ed6b7
|
Various tweaks and fixes as suggested by PVS Studio (thanks PVS Studio!) [docking branch]
|
2019-01-16 16:19:38 +01:00 |
|
omar
|
32c4e01267
|
Various tweaks and fixes as suggested by PVS Studio (thanks PVS Studio!)
|
2019-01-16 16:13:23 +01:00 |
|
omar
|
06aaf23877
|
Various tweaks and fixes as suggested by PVS Studio (thanks PVS Studio!)
|
2019-01-16 16:10:51 +01:00 |
|
omar
|
8a45c56c2c
|
Merge branch 'viewport' into docking
|
2019-01-15 21:22:29 +01:00 |
|
omar
|
9391a97fbf
|
Merge branch 'master' into viewport
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_win32.cpp
# examples/imgui_impl_win32.h
|
2019-01-15 21:22:21 +01:00 |
|
omar
|
95ee99e6aa
|
Version 1.68 WIP
|
2019-01-15 20:19:05 +01:00 |
|
omar
|
ff4bd758ca
|
Merge branch 'viewport' into docking
|
2019-01-14 21:30:07 +01:00 |
|
omar
|
e24674fc0e
|
Merge branch 'master' into viewport
|
2019-01-14 21:30:01 +01:00 |
|
omar
|
7a5058e3bf
|
Version 1.67
|
2019-01-14 17:41:44 +01:00 |
|
omar
|
1da40df279
|
DragFloat: Fixed broken mouse direction change with power!=1.0. (#2174, #2206) [@Joshhua5]
|
2019-01-14 17:38:19 +01:00 |
|
omar
|
6e41745f31
|
Added a bunch of diagnostic ignore to cope with Clang -Weverything being absurd. Also fixed two legit warnings. (#2277)
|
2019-01-13 18:57:46 +01:00 |
|
omar
|
8011197c50
|
Merge branch 'viewport' into docking
# Conflicts:
# imgui.cpp
|
2019-01-10 16:02:32 +01:00 |
|
omar
|
c96aaef132
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
# imgui.h
|
2019-01-10 16:01:36 +01:00 |
|
omar
|
1f6e0b2f98
|
ImVector: Made a struct. Using T/T* in the code instead of value_type/iterator. Renamed index_from_pointer() to index_from_ptr() (was not documented, added in 1.63, users not supposed to use ImVector, hopefully not a big deal).
|
2019-01-10 15:51:08 +01:00 |
|
omar
|
61a99f994e
|
Minot internal tweaks, comments
|
2019-01-08 23:11:54 +01:00 |
|
omar
|
b33977bc15
|
Tests: Reworking hook prototypes for imgui-test to be faster and multi-context friendly.
|
2019-01-07 23:59:05 +01:00 |
|
omar
|
c2db7f63bd
|
Selectable() should have an ID even though they are disabled, to be consistent with other widgets. Not sure of the reasoning ~1.41 which made this turn to 0.
|
2019-01-07 23:48:50 +01:00 |
|
omar
|
6b32570644
|
Merge branch 'viewport' into docking
# Conflicts:
# imgui_internal.h
# imgui_widgets.cpp
|
2019-01-07 21:29:15 +01:00 |
|
omar
|
5af930f97a
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_internal.h
|
2019-01-07 21:28:29 +01:00 |
|
omar
|
1ae7f88495
|
Tabs: Added ImGuiTabBarFlags_NoTooltip flag. (#261, #351) + added helpful assert
|
2019-01-07 18:07:09 +01:00 |
|
omar
|
acfa4050ec
|
Tweak changelog + tweak internal render helper functions.
|
2019-01-07 16:43:55 +01:00 |
|
omar
|
c3af134cc8
|
IO: Renamed InputCharacters[], marked internal as was always intended. AddInputCharacter() goes into a queue which can receive as many characters as needed during the frame. This is useful for automation to not have an upper limit on typing speed. Will later transition key/mouse to use the event queue later.
|
2019-01-06 16:37:42 +01:00 |
|
omar
|
9ba202821f
|
Nav: Fixed an keyboard issue where holding Activate/Space for longer than two frames on a button would unnecessary keep the focus on the parent window, which could steal it from newly appearing windows. (#787)
|
2019-01-04 19:03:56 +01:00 |
|
omar
|
d223d1e951
|
Added bindings in Readme. Added internal IMGUI_DEBUG_LOG() helper. Comments, missing breaking changes note relative to imgui_impl_xxxx changes, not really part of core but worth adding in the imgui.cpp breaking change section.
|
2019-01-04 18:01:43 +01:00 |
|
omar
|
7f7e8eeecd
|
Docking: Fixed a bug undocking a window from its tab when it is the only docked window of a root dockspace with ConfigDockingTabBarOnSingleWindows enabled.
|
2019-01-03 22:11:14 +01:00 |
|
omar
|
ce1626a51e
|
Merge branch 'viewport' into docking
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_internal.h
|
2019-01-02 21:36:21 +01:00 |
|
omar
|
951c9dd68b
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_sdl.cpp
|
2019-01-02 19:00:31 +01:00 |
|
omar
|
acacd93836
|
Renamed extra_flags to flags in InputXXX parameters.
|
2019-01-02 11:08:14 +01:00 |
|
omar
|
c738f9ef92
|
InputFloat: When using ImGuiInputTextFlags_ReadOnly the step buttons are disabled. (#2257)
|
2019-01-02 11:03:56 +01:00 |
|
omar
|
088ef6623a
|
Merge branch 'viewport' into docking
|
2018-12-18 15:03:01 +01:00 |
|
omar
|
9c916cdaf9
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
|
2018-12-18 15:02:35 +01:00 |
|
omar
|
ae76a1fda7
|
Window, Focus, Popup: Fixed an issue where closing a popup by clicking another window with the _NoMove flag would refocus the parent window of the popup instead of the newly clicked window.
|
2018-12-18 15:01:15 +01:00 |
|
omar
|
ac9512e095
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
|
2018-12-14 18:46:24 +01:00 |
|
omar
|
65dac02171
|
Internals: Popups: Renamed CurrentPopupStack to BeginPopupStack which is much less ambiguous.
|
2018-12-14 18:44:17 +01:00 |
|
omar
|
f6f5c51106
|
Internals: Popups: EndMenu() calls ClosePopupToLevel(g.CurrentPopupStack.Size) which is more correct.
|
2018-12-14 18:42:28 +01:00 |
|
omar
|
587506dd57
|
Tests: Changed prototype of ImGuiTestEngineHook_ItemAdd to match functions called in same spot. Made ButtonBehavior submit fallback item info if ItemAdd() was not called (for resize grips, resize borders, scrollbar, columns, etc.)
|
2018-12-14 11:27:02 +01:00 |
|
omar
|
2a1e903f43
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.h
|
2018-12-13 19:20:34 +01:00 |
|
omar
|
991b16cc6a
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
# imgui_widgets.cpp
|
2018-12-11 19:46:46 +01:00 |
|
omar
|
1b263f6ab0
|
Tabs: Fixed support for drag and drop ImGuiButtonFlags_PressedOnDragDropHold. (#261) incorrectly missing from the merge from Docking branch.
|
2018-12-11 19:37:22 +01:00 |
|
omar
|
5a6b8e00db
|
BeginTabBar: Fix to push the expected ID into the ID stack (instead of a hash's hash). (#261)
|
2018-12-11 15:22:10 +01:00 |
|
omar
|
067b691fd8
|
Merge branch 'viewport' into docking
# Conflicts:
# docs/TODO.txt
# imgui.cpp
# imgui.h
# imgui_demo.cpp
# imgui_draw.cpp
# imgui_internal.h
# imgui_widgets.cpp
|
2018-12-11 13:23:00 +01:00 |
|