omar
|
90d0b8b58b
|
Navigation: minor sync to reduce drifts between changes
|
2017-12-12 23:41:20 +01:00 |
|
omar
|
fa9327ccf8
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_draw.cpp
# imgui_internal.h
|
2017-12-12 20:44:12 +01:00 |
|
omar
|
d0a1be0de0
|
Merge branch 'drag_and_drop'
|
2017-12-12 20:39:52 +01:00 |
|
omar
|
3ea5e67ba2
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
|
2017-12-12 18:47:23 +01:00 |
|
omar
|
28bbf1ade6
|
Fixed ParentWindow setup which broke Modal windows (fix c65124f415)
|
2017-12-12 18:45:57 +01:00 |
|
omar
|
052b6021dd
|
Merge branch 'master' into drag_and_drop
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_internal.h
|
2017-12-12 15:02:05 +01:00 |
|
omar
|
0a3db267c3
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_demo.cpp
# imgui_internal.h
|
2017-12-12 14:58:53 +01:00 |
|
omar
|
c22657985a
|
Added GetFrameHeight() function (used to be SmallSquareSize internally)
|
2017-12-12 14:12:49 +01:00 |
|
omar
|
ee7f1921e8
|
Internals: Added GetSmallSquareSize()
|
2017-12-12 14:08:58 +01:00 |
|
omar
|
c65124f415
|
Internals: ParentWindow is now NULL for non-child windows and means what everyone expects.
|
2017-12-12 12:50:43 +01:00 |
|
omar
|
f42d7b89e2
|
Internals: Removed misleading GetWindowParent() function. + renaming to clear confusing.
|
2017-12-12 12:50:42 +01:00 |
|
omar
|
4a555d35f0
|
IsWindowHovered(): split ImGuiHoveredFlags_FlattenChild into separate ChildWindows and RootWindow flags. Allowing more combination and a better symetry with IsWindowFocused() flags. (#1382)
|
2017-12-12 12:50:42 +01:00 |
|
omar
|
45f440bb7d
|
Internals: Renamed ImGuiButtonFlags_FlattenChilds -> ImGuiButtonFlags_FlattenChildren, ImGuiButtonFlags_AllowOverlapMode -> ImGuiButtonFlags_AllowItemOverlap
|
2017-12-11 22:39:10 +01:00 |
|
omar
|
2b9d8ab91d
|
Merge branch 'master' into drag_and_drop
# Conflicts:
# imgui.cpp
# imgui.h
|
2017-12-11 16:39:27 +01:00 |
|
omar
|
d1db229907
|
Merge branch 'master' into navigation
# Conflicts:
# imgui_demo.cpp
|
2017-12-10 19:01:59 +01:00 |
|
omar
|
e3e0326ea9
|
Exposed BeginCombo() publicly.
|
2017-12-10 18:08:59 +01:00 |
|
omar
|
eab6333a0b
|
SetNextWindowContentSize() adjust for client->window size, but the fate of borders isn't really clear for now (until now we always tried to make borders not affect layout, so if we want a 200x200 fully visible space with borders and zero window padding user need to include the borders) (#1490)
|
2017-12-10 17:36:30 +01:00 |
|
omar
|
a6f37287d8
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
|
2017-12-08 15:06:37 +01:00 |
|
omar
|
a5e9392140
|
Combo: Added flags to BeginCombo() new api, removed explicit height, default to 8 instead of 7 items, allow popup height constraints via SetNextWindowSizeConstraints(), width expand if contents doesn't fit, popup reposition policy if it doesn't fit.
|
2017-12-08 15:03:26 +01:00 |
|
omar
|
7bf85db6c4
|
Drag and drop: Added COL3F payload for color without alpha overwrite. Exposed standard color payload types in imgui.h (#143)
|
2017-12-08 12:48:53 +01:00 |
|
omar
|
553b0fcf8f
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
|
2017-12-07 21:20:16 +01:00 |
|
omar
|
45466a8cf9
|
Internals: BeginCombo() added dummy ImGuiComboFlags.
|
2017-12-07 21:14:41 +01:00 |
|
omar
|
e6215b6ca0
|
Merge branch 'master' into navigation + merge fix
# Conflicts:
# imgui.cpp
|
2017-12-07 16:42:52 +01:00 |
|
omar
|
8959c64b33
|
Internals: Cleanup FindBestPopupWindowPos() to be more digestible, since we are bounds to rework the logic there. No functional changes intended
|
2017-12-07 13:29:14 +01:00 |
|
omar
|
2fc6a82665
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
# imgui.h
|
2017-12-06 17:44:40 +01:00 |
|
omar
|
beda5fc5a0
|
Fixed scrollbar enable/disable calculation when size is modified programmatically. This is the generalization of the fix in 2df8fa95df.
|
2017-12-06 15:13:45 +01:00 |
|
omar
|
e103fe8c1f
|
Tweak four-corners resize grip code. Added ImRect::FixInverted() helper. (#822)
|
2017-12-06 15:13:45 +01:00 |
|
omar
|
729333293c
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
# imgui.h
|
2017-12-05 22:56:35 +01:00 |
|
omar
|
b9dc0caee3
|
Tweak four-corners resize grip code. Added ImRect::FixInverted() helper. (#822)
|
2017-12-05 22:44:52 +01:00 |
|
omar
|
364251146b
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
|
2017-12-05 16:15:05 +01:00 |
|
omar
|
16d9fa30b2
|
Merge branch 'master' into drag_and_drop
|
2017-12-05 09:21:07 +01:00 |
|
omar
|
c860a0a85c
|
Internals: ImRect: Added IsFinite() helper.
|
2017-12-01 17:39:13 +01:00 |
|
omar
|
81cbaef806
|
Merge branch 'master' into navigation
|
2017-11-29 23:49:17 +01:00 |
|
omar
|
52e475230f
|
Settings: Internals: Renaming.
|
2017-11-28 23:16:09 +01:00 |
|
omar
|
7ae71e4984
|
Settings: Internals: Added FindSettingsHandler()
|
2017-11-28 21:04:38 +01:00 |
|
omar
|
35eb5c5c99
|
Settings: Internals: Exposed FindWindowSettings(). Simplified some code.
|
2017-11-28 21:04:38 +01:00 |
|
omar
|
963259d128
|
Settings: Internals: Renamed ImGuiSettingsWindow to ImGuiWindowSettings.
|
2017-11-28 21:04:38 +01:00 |
|
omar
|
63712d5f5c
|
Merge branch 'master' into drag_and_drop
|
2017-11-28 17:28:45 +01:00 |
|
omar
|
9191b17218
|
Merge branch 'master' into navigation
|
2017-11-28 17:28:08 +01:00 |
|
omar
|
f3ec608c19
|
Settings: Initializing ImGuiSettingsWindow so external users don't end up with uncleared data. Exposed MarkIniSettingsDirty() in imgui_internal.h
|
2017-11-28 10:49:43 +01:00 |
|
omar
|
7e2d0d734c
|
Settings: basic refactor so that additional data structures can be loaded/saved. Parser/saver is still the minimum viable poor-man parsing.
|
2017-11-27 23:57:11 +01:00 |
|
omar
|
d552cabd15
|
Settings: Internal renaming of structure and fields names.
|
2017-11-27 23:57:10 +01:00 |
|
omar
|
4e3c7f1557
|
Nav: Exposed NavInitWindow() in imgui_internal (#787)
|
2017-11-24 16:55:49 +01:00 |
|
omar
|
7763ab3fcc
|
Menu bar: better software clipping to handle small windows, in particular child window don't have the minimum constraint added in e9a7e73bba so we need to render clipped menus better.
|
2017-11-22 15:58:20 +01:00 |
|
omar
|
b618629d99
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
|
2017-11-22 12:34:59 +01:00 |
|
omar
|
7d09a0ae99
|
Menu bar: better software clipping to handle small windows, in particular child window don't have the minimum constraint added in e9a7e73bba so we need to render clipped menus better.
|
2017-11-22 12:33:59 +01:00 |
|
omar
|
68b26b4867
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
|
2017-11-22 11:04:00 +01:00 |
|
omar
|
302757447a
|
Internals: Added SplitterBehavior(). (#319)
|
2017-11-20 19:41:17 +01:00 |
|
omar
|
2543807e56
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
2017-11-20 13:54:06 +01:00 |
|
omar
|
3f5b2a3fe3
|
Exposed ImDrawCornerFlags, replaced occurences of ~0 with an explicit ImDrawCornerFlags_All. Inversed BotLeft (prev 1<<3, now 1<<2) and BotRight (prev 1<<2, now 1<<3).
|
2017-11-20 13:53:16 +01:00 |
|