Commit Graph

4459 Commits (0b1d6a0d52e8d7767d710d48ed8e81c2e698c861)
 

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