omar
|
ffb4f6ca8c
|
Merge branch 'master' into navigation
|
7 years ago |
|
omar
|
9cda86d55a
|
Internals: Added IM_NEW, IM_DELETE helper macros (#1517, #484, #504)
|
7 years ago |
|
omar
|
1f26652944
|
Various zealous warning fixes (thanks Clang).
|
7 years ago |
|
omar
|
287380261c
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
|
7 years ago |
|
omar
|
c8c872c753
|
Internals: String functions uses size_t in their signature
|
7 years ago |
|
omar
|
531c11d5c7
|
ImDrawList: Small refactor toward removing dependency on GImGui + PushClipRectFullscreen now correctly uses data provided by imgui which can takes account of DisplaySize + Removed static variable in PathArcToFast() which caused linking issues to some.
|
7 years ago |
|
omar
|
4c2514dc29
|
Merge branch 'master' into navigation
|
7 years ago |
|
omar
|
b9391d1692
|
Columns: Internal: Columns have their no set of flags so NoResize can be setup by internal code. (#125)
|
7 years ago |
|
omar
|
cc3192f347
|
Merge branch 'master' into navigation
# Conflicts:
# imgui_internal.h
|
7 years ago |
|
omar
|
ddbcda8c1b
|
Columns: Column width data is no longer lost while dragging toward the right side. (#1499, #125)
|
7 years ago |
|
omar
|
e8e84a6ad6
|
Columns: Added internal tracking of a few flag temporarily, to facilitate the work of third-parties who have columns patches. (#125)
|
7 years ago |
|
omar
|
4ae5c7e227
|
Columns: Refactor: Moved ColumnsSet[] to window out of DC as they are persistent data for most + fix for pre C++11 compilers. (#125, #1499)
|
7 years ago |
|
omar
|
b016215c80
|
Columns: Refactor: Not using statestorage lookup anymore. (#125, #1499)
|
7 years ago |
|
omar
|
3a31a75e3b
|
Columns: Refactor: Renamed all members. (#125, #1499)
|
7 years ago |
|
omar
|
78320aa633
|
Columns: Refactor: Moved columns data into their own data structure. Minimum changes now to ease diffing. (#125, #1499)
|
7 years ago |
|
omar
|
16fb58984f
|
Merge branch 'master' into navigation
|
7 years ago |
|
omar
|
90d0b8b58b
|
Navigation: minor sync to reduce drifts between changes
|
7 years ago |
|
omar
|
8b59ed0708
|
Drag and Drop: Exposed some internals.
|
7 years ago |
|
omar
|
7c7a7baf76
|
Merged miscellaneous small stuff (from nav/dock branches).
|
7 years ago |
|
omar
|
fa9327ccf8
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_draw.cpp
# imgui_internal.h
|
7 years ago |
|
omar
|
d0a1be0de0
|
Merge branch 'drag_and_drop'
|
7 years ago |
|
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
|
052b6021dd
|
Merge branch 'master' into drag_and_drop
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_internal.h
|
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
|
2b9d8ab91d
|
Merge branch 'master' into drag_and_drop
# Conflicts:
# imgui.cpp
# imgui.h
|
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
|
7bf85db6c4
|
Drag and drop: Added COL3F payload for color without alpha overwrite. Exposed standard color payload types in imgui.h (#143)
|
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
|
16d9fa30b2
|
Merge branch 'master' into drag_and_drop
|
7 years ago |
|
omar
|
c860a0a85c
|
Internals: ImRect: Added IsFinite() helper.
|
7 years ago |