omar
|
3ea5e67ba2
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
|
7 years ago |
|
omar
|
28bbf1ade6
|
Fixed ParentWindow setup which broke Modal windows (fix c65124f415)
|
7 years ago |
|
omar
|
0a3db267c3
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_demo.cpp
# imgui_internal.h
|
7 years ago |
|
omar
|
c22657985a
|
Added GetFrameHeight() function (used to be SmallSquareSize internally)
|
7 years ago |
|
omar
|
ee7f1921e8
|
Internals: Added GetSmallSquareSize()
|
7 years ago |
|
omar
|
c65124f415
|
Internals: ParentWindow is now NULL for non-child windows and means what everyone expects.
|
7 years ago |
|
omar
|
f42d7b89e2
|
Internals: Removed misleading GetWindowParent() function. + renaming to clear confusing.
|
7 years ago |
|
omar
|
4a555d35f0
|
IsWindowHovered(): split ImGuiHoveredFlags_FlattenChild into separate ChildWindows and RootWindow flags. Allowing more combination and a better symetry with IsWindowFocused() flags. (#1382)
|
7 years ago |
|
omar
|
45f440bb7d
|
Internals: Renamed ImGuiButtonFlags_FlattenChilds -> ImGuiButtonFlags_FlattenChildren, ImGuiButtonFlags_AllowOverlapMode -> ImGuiButtonFlags_AllowItemOverlap
|
7 years ago |
|
omar
|
d1db229907
|
Merge branch 'master' into navigation
# Conflicts:
# imgui_demo.cpp
|
7 years ago |
|
omar
|
e3e0326ea9
|
Exposed BeginCombo() publicly.
|
7 years ago |
|
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)
|
7 years ago |
|
omar
|
a6f37287d8
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
|
7 years ago |
|
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.
|
7 years ago |
|
omar
|
553b0fcf8f
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
|
7 years ago |
|
omar
|
45466a8cf9
|
Internals: BeginCombo() added dummy ImGuiComboFlags.
|
7 years ago |
|
omar
|
e6215b6ca0
|
Merge branch 'master' into navigation + merge fix
# Conflicts:
# imgui.cpp
|
7 years ago |
|
omar
|
8959c64b33
|
Internals: Cleanup FindBestPopupWindowPos() to be more digestible, since we are bounds to rework the logic there. No functional changes intended
|
7 years ago |
|
omar
|
2fc6a82665
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
# imgui.h
|
7 years ago |
|
omar
|
beda5fc5a0
|
Fixed scrollbar enable/disable calculation when size is modified programmatically. This is the generalization of the fix in 2df8fa95df.
|
7 years ago |
|
omar
|
e103fe8c1f
|
Tweak four-corners resize grip code. Added ImRect::FixInverted() helper. (#822)
|
7 years ago |
|
omar
|
729333293c
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
# imgui.h
|
7 years ago |
|
omar
|
b9dc0caee3
|
Tweak four-corners resize grip code. Added ImRect::FixInverted() helper. (#822)
|
7 years ago |
|
omar
|
364251146b
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
|
7 years ago |
|
omar
|
c860a0a85c
|
Internals: ImRect: Added IsFinite() helper.
|
7 years ago |
|
omar
|
81cbaef806
|
Merge branch 'master' into navigation
|
7 years ago |
|
omar
|
52e475230f
|
Settings: Internals: Renaming.
|
7 years ago |
|
omar
|
7ae71e4984
|
Settings: Internals: Added FindSettingsHandler()
|
7 years ago |
|
omar
|
35eb5c5c99
|
Settings: Internals: Exposed FindWindowSettings(). Simplified some code.
|
7 years ago |
|
omar
|
963259d128
|
Settings: Internals: Renamed ImGuiSettingsWindow to ImGuiWindowSettings.
|
7 years ago |
|
omar
|
9191b17218
|
Merge branch 'master' into navigation
|
7 years ago |
|
omar
|
f3ec608c19
|
Settings: Initializing ImGuiSettingsWindow so external users don't end up with uncleared data. Exposed MarkIniSettingsDirty() in imgui_internal.h
|
7 years ago |
|
omar
|
7e2d0d734c
|
Settings: basic refactor so that additional data structures can be loaded/saved. Parser/saver is still the minimum viable poor-man parsing.
|
7 years ago |
|
omar
|
d552cabd15
|
Settings: Internal renaming of structure and fields names.
|
7 years ago |
|
omar
|
4e3c7f1557
|
Nav: Exposed NavInitWindow() in imgui_internal (#787)
|
7 years ago |
|
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.
|
7 years ago |
|
omar
|
b618629d99
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
|
7 years ago |
|
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.
|
7 years ago |
|
omar
|
68b26b4867
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
|
7 years ago |
|
omar
|
302757447a
|
Internals: Added SplitterBehavior(). (#319)
|
7 years ago |
|
omar
|
2543807e56
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
7 years ago |
|
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).
|
7 years ago |
thedmd
|
8b2d449b16
|
Add ShadeVertsLinearUV()
|
7 years ago |
|
omar
|
9848a7023b
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
|
7 years ago |
|
omar
|
9a44d447cd
|
NewFrame() now asserts if neither Render or EndFrame have been called. Exposed EndFrame(). Made it legal to call EndFrame() more than one. (#1423 etc.)
|
7 years ago |
|
omar
|
d211a0e338
|
Merge branch 'master' into navigation (with style breakable)
# Conflicts:
# imgui.cpp
# imgui_draw.cpp
|
7 years ago |
|
omar
|
6f7b1bf2e1
|
Internals: Renamed ImGuiWindow::Accessed to WriteAccessed.
|
7 years ago |
|
omar
|
29e0078b66
|
Internals: Window minor internal renaming + added WindowRounding latch.
|
7 years ago |
|
omar
|
834fa52c8e
|
Columns: Added ImGuiColumnsFlags_GrowParentContentsSize to internal API to restore old content sizes behavior. (#1444, #125)
|
7 years ago |
|
omar
|
44c590393c
|
Merge branch 'master' into navigation
|
7 years ago |