7c7a7baf76
Merged miscellaneous small stuff (from nav/dock branches).
ago%!(EXTRA string=7 years)
b174fcc9af
Added IsAnyWindowFocused() (from Nav branch).
ago%!(EXTRA string=7 years)
fa9327ccf8
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_draw.cpp
# imgui_internal.h
ago%!(EXTRA string=7 years)
d0a1be0de0
Merge branch 'drag_and_drop'
ago%!(EXTRA string=7 years)
ab049c6fc0
Drag and Drop: Fix merge for IMGUI_DISABLE_OBSOLETE_FUNCTIONS
ago%!(EXTRA string=7 years)
7faa5b16bb
Tweak
ago%!(EXTRA string=7 years)
3ea5e67ba2
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
ago%!(EXTRA string=7 years)
02e0a078f4
Begin: Tidying up code to make it more readable.
ago%!(EXTRA string=7 years)
28bbf1ade6
Fixed ParentWindow setup which broke Modal windows (fix c65124f415)
ago%!(EXTRA string=7 years)
d561a43a4d
Drag and Drop: Drop target infer a fallback ID from the rectangle. Avoid Preview being accepted on drop frame when drop target has no ID. ( #143 )
ago%!(EXTRA string=7 years)
ef1a683ebe
Removed use of obsolete ImGui API.
ago%!(EXTRA string=7 years)
e98df91dc4
Drag and Drop: Added ImGuiCol_DragDropTarget ( #143 , #707 )
ago%!(EXTRA string=7 years)
7ec934f439
Drag and Drop: Comments
ago%!(EXTRA string=7 years)
052b6021dd
Merge branch 'master' into drag_and_drop
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_internal.h
ago%!(EXTRA string=7 years)
0a3db267c3
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_demo.cpp
# imgui_internal.h
ago%!(EXTRA string=7 years)
6190ab0084
Renamed GetItemsLineHeightWithSpacing() to GetFrameHeightWithSpacing()
ago%!(EXTRA string=7 years)
c22657985a
Added GetFrameHeight() function (used to be SmallSquareSize internally)
ago%!(EXTRA string=7 years)
ee7f1921e8
Internals: Added GetSmallSquareSize()
ago%!(EXTRA string=7 years)
08b72eb5c0
IsWindowFocused() refactor will flags. ( #1382 )
...
Marked IsRootWindowFocused() as obsolete in favor of using IsWindowFocused(ImGuiFocusedFlags_RootWindow).
Marked IsRootWindowOrAnyChildFocused() as obsolete in favor of using IsWindowFocused(ImGuiFocusedFlags_RootAndChildWindows).
ago%!(EXTRA string=7 years)
8d8f4934fb
Demo: mouse dragging demo tweaks
ago%!(EXTRA string=7 years)
fa179d0ad8
Reordered ImGuiHoveredFlags to match upcoming ImGuiFocusedFlags ( #1382 )
ago%!(EXTRA string=7 years)
de4a851f95
Font documentation update ( #1498 )
ago%!(EXTRA string=7 years)
c65124f415
Internals: ParentWindow is now NULL for non-child windows and means what everyone expects.
ago%!(EXTRA string=7 years)
f42d7b89e2
Internals: Removed misleading GetWindowParent() function. + renaming to clear confusing.
ago%!(EXTRA string=7 years)
4a555d35f0
IsWindowHovered(): split ImGuiHoveredFlags_FlattenChild into separate ChildWindows and RootWindow flags. Allowing more combination and a better symetry with IsWindowFocused() flags. ( #1382 )
ago%!(EXTRA string=7 years)
185c1eaaf3
Alignment + removed comments
ago%!(EXTRA string=7 years)
f93945540f
Renamed ImGuiTreeNodeFlags_AllowOverlapMode to ImGuiTreeNodeFlags_AllowItemOverlap. ( #600 , #1330 )
ago%!(EXTRA string=7 years)
45f440bb7d
Internals: Renamed ImGuiButtonFlags_FlattenChilds -> ImGuiButtonFlags_FlattenChildren, ImGuiButtonFlags_AllowOverlapMode -> ImGuiButtonFlags_AllowItemOverlap
ago%!(EXTRA string=7 years)
6b168b43ff
Comments ( #822 )
ago%!(EXTRA string=7 years)
2b9d8ab91d
Merge branch 'master' into drag_and_drop
...
# Conflicts:
# imgui.cpp
# imgui.h
ago%!(EXTRA string=7 years)
38bfdb357e
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
ago%!(EXTRA string=7 years)
f06f68f3ce
Obsoleted old functions: SetScrollPosHere (marked obsolete in 1.42, July 2015). GetWindowFont(), GetWindowFontSize() (marked obsolete in 1.48, March 2016)
ago%!(EXTRA string=7 years)
9fd15defe4
Added an implementation of SetItemDefaultFocus() in the master branch for combo patterns to use and be more forward-compatible. ( #787 )
ago%!(EXTRA string=7 years)
6d93011fdf
alloca fix to allow Clang with Microsoft CodeGen path
ago%!(EXTRA string=7 years)
e67f3809ed
Replaced obsolete function with new one.
ago%!(EXTRA string=7 years)
d1db229907
Merge branch 'master' into navigation
...
# Conflicts:
# imgui_demo.cpp
ago%!(EXTRA string=7 years)
71296910a0
Demo: Tweaks and spacing. Stopped using rand() function in demo code.
ago%!(EXTRA string=7 years)
4b8857d536
Demo: About box tweaks.
ago%!(EXTRA string=7 years)
1096e14356
ImFont: Added GetDebugName() helper.
ago%!(EXTRA string=7 years)
e3e0326ea9
Exposed BeginCombo() publicly.
ago%!(EXTRA string=7 years)
080f61858f
Sorted typedefs/enumations forward declarations in imgui.h
ago%!(EXTRA string=7 years)
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 )
ago%!(EXTRA string=7 years)
7ac1583411
Scrollbar: Minor simplication of the code using InnerRect data.
ago%!(EXTRA string=7 years)
a9b01600ac
Internals: window->InnerRect includes removal of borders so it'll be easier to use from other locations.
ago%!(EXTRA string=7 years)
20ba79aa56
Demo: Added "No close" option.
ago%!(EXTRA string=7 years)
b75acc21b0
Fix for border under title bar when WindowBorderSize == 0 and FrameBorderSize > 0
ago%!(EXTRA string=7 years)
0872020c5c
Comments
ago%!(EXTRA string=7 years)
f72b002da8
Removed SetNextWindowContentWidth(), prefer using SetNextWindowContentSize(). Kept redirection function (will obsolete). ( #246 , #519 , #1444 )
ago%!(EXTRA string=7 years)
e23083a080
Fixed warning: logical ‘and’ of equal expressions
ago%!(EXTRA string=7 years)
0365c524a2
ColorPicker4: Fixed returning true when holding mouse button on the sat/value/alpha locations. ( #1489 )
ago%!(EXTRA string=8 years)
omar
Branimir Karadžić