omar
16fb58984f
Merge branch 'master' into navigation
2017-12-12 23:41:48 +01:00
omar
90d0b8b58b
Navigation: minor sync to reduce drifts between changes
2017-12-12 23:41:20 +01:00
omar
8b59ed0708
Drag and Drop: Exposed some internals.
2017-12-12 23:37:27 +01:00
omar
90788a1242
ImVector: Added ImVector::contains() helper
2017-12-12 23:36:42 +01:00
omar
7c7a7baf76
Merged miscellaneous small stuff (from nav/dock branches).
2017-12-12 23:36:25 +01:00
omar
b174fcc9af
Added IsAnyWindowFocused() (from Nav branch).
2017-12-12 23:35:04 +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
ab049c6fc0
Drag and Drop: Fix merge for IMGUI_DISABLE_OBSOLETE_FUNCTIONS
2017-12-12 20:34:16 +01:00
omar
7faa5b16bb
Tweak
2017-12-12 19:15:00 +01:00
omar
3ea5e67ba2
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
2017-12-12 18:47:23 +01:00
omar
02e0a078f4
Begin: Tidying up code to make it more readable.
2017-12-12 18:46:42 +01:00
omar
28bbf1ade6
Fixed ParentWindow setup which broke Modal windows (fix c65124f415)
2017-12-12 18:45:57 +01:00
omar
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 )
2017-12-12 18:17:37 +01:00
Branimir Karadžić
ef1a683ebe
Removed use of obsolete ImGui API.
2017-12-12 17:59:09 +01:00
omar
e98df91dc4
Drag and Drop: Added ImGuiCol_DragDropTarget ( #143 , #707 )
2017-12-12 15:44:22 +01:00
omar
7ec934f439
Drag and Drop: Comments
2017-12-12 15:33:26 +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
6190ab0084
Renamed GetItemsLineHeightWithSpacing() to GetFrameHeightWithSpacing()
2017-12-12 14:14:58 +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
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).
2017-12-12 14:07:12 +01:00
omar
8d8f4934fb
Demo: mouse dragging demo tweaks
2017-12-12 13:11:40 +01:00
omar
fa179d0ad8
Reordered ImGuiHoveredFlags to match upcoming ImGuiFocusedFlags ( #1382 )
2017-12-12 12:52:24 +01:00
omar
de4a851f95
Font documentation update ( #1498 )
2017-12-12 12:50:43 +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
185c1eaaf3
Alignment + removed comments
2017-12-11 22:55:28 +01:00
omar
f93945540f
Renamed ImGuiTreeNodeFlags_AllowOverlapMode to ImGuiTreeNodeFlags_AllowItemOverlap. ( #600 , #1330 )
2017-12-11 22:42:12 +01:00
omar
45f440bb7d
Internals: Renamed ImGuiButtonFlags_FlattenChilds -> ImGuiButtonFlags_FlattenChildren, ImGuiButtonFlags_AllowOverlapMode -> ImGuiButtonFlags_AllowItemOverlap
2017-12-11 22:39:10 +01:00
omar
6b168b43ff
Comments ( #822 )
2017-12-11 19:47:23 +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
38bfdb357e
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
2017-12-11 16:28:47 +01:00
omar
f06f68f3ce
Obsoleted old functions: SetScrollPosHere (marked obsolete in 1.42, July 2015). GetWindowFont(), GetWindowFontSize() (marked obsolete in 1.48, March 2016)
2017-12-11 16:22:52 +01:00
omar
9fd15defe4
Added an implementation of SetItemDefaultFocus() in the master branch for combo patterns to use and be more forward-compatible. ( #787 )
2017-12-11 16:19:37 +01:00
omar
6d93011fdf
alloca fix to allow Clang with Microsoft CodeGen path
2017-12-11 10:25:44 +01:00
Branimir Karadžić
e67f3809ed
Replaced obsolete function with new one.
2017-12-11 09:57:05 +01:00
omar
d1db229907
Merge branch 'master' into navigation
...
# Conflicts:
# imgui_demo.cpp
2017-12-10 19:01:59 +01:00
omar
71296910a0
Demo: Tweaks and spacing. Stopped using rand() function in demo code.
2017-12-10 18:49:47 +01:00
omar
4b8857d536
Demo: About box tweaks.
2017-12-10 18:45:05 +01:00
omar
1096e14356
ImFont: Added GetDebugName() helper.
2017-12-10 18:34:32 +01:00
omar
e3e0326ea9
Exposed BeginCombo() publicly.
2017-12-10 18:08:59 +01:00
omar
080f61858f
Sorted typedefs/enumations forward declarations in imgui.h
2017-12-10 17:57:27 +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
7ac1583411
Scrollbar: Minor simplication of the code using InnerRect data.
2017-12-10 17:27:37 +01:00
omar
a9b01600ac
Internals: window->InnerRect includes removal of borders so it'll be easier to use from other locations.
2017-12-10 17:24:10 +01:00
omar
20ba79aa56
Demo: Added "No close" option.
2017-12-10 17:02:41 +01:00
omar
b75acc21b0
Fix for border under title bar when WindowBorderSize == 0 and FrameBorderSize > 0
2017-12-10 16:48:18 +01:00
