Benj
/
imgui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,229 Commits
1 Branch
0 Tags
81 MiB
Commit Graph

4229 Commits (b69dc45f6e94e931c38cc9e7101b7f4f97b4756d)
 

Author SHA1 Message Date
omar 5f39758202 Minor tweaks, comments, spacing fixes
omar cc3192f347 Merge branch 'master' into navigation 
# Conflicts:
#	imgui_internal.h
omar f265e16b84 Revert "Scrollbar: Minor simplication of the code using InnerRect data." > Introduced sheering on the scrollbar rectangle because InnerRect isn't setup at this point. 
This reverts commit 7ac1583411.
omar 3905816082 Added ShowFontSelector(), ShowStyleSelector(). ()
omar ddbcda8c1b Columns: Column width data is no longer lost while dragging toward the right side. (, )
omar ba71e1c0e4 Columns: Minor stylistic fixes. ()
omar f7c5f420e7 BeginChild() fix using negative sizes as window position because of erroneous clamping. It was hard to notice until we added asserts for it. ()
omar e8e84a6ad6 Columns: Added internal tracking of a few flag temporarily, to facilitate the work of third-parties who have columns patches. ()
omar 4ae5c7e227 Columns: Refactor: Moved ColumnsSet[] to window out of DC as they are persistent data for most + fix for pre C++11 compilers. (, )
omar b016215c80 Columns: Refactor: Not using statestorage lookup anymore. (, )
omar 3a31a75e3b Columns: Refactor: Renamed all members. (, )
omar 78320aa633 Columns: Refactor: Moved columns data into their own data structure. Minimum changes now to ease diffing. (, )
omar 027ffd91ea IsWindowFocused(): oops, that was bound to happen with loosely typed enums (this is sort of why I made both values identical - no direct side effects).
omar 16fb58984f Merge branch 'master' into navigation
omar 90d0b8b58b Navigation: minor sync to reduce drifts between changes
omar 8b59ed0708 Drag and Drop: Exposed some internals.
omar 90788a1242 ImVector: Added ImVector::contains() helper
omar 7c7a7baf76 Merged miscellaneous small stuff (from nav/dock branches).
omar b174fcc9af Added IsAnyWindowFocused() (from Nav branch).
omar fa9327ccf8 Merge branch 'master' into navigation 
# Conflicts:
#	imgui.cpp
#	imgui.h
#	imgui_draw.cpp
#	imgui_internal.h
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. ()