43df7eb5ea
Added OpenPopupOnItemClick(); helper which mimic BeginPopupContextItem() but doesn't do the open.
...
Made the color popups uses this standard function so they handle reopening a context menu.
7 years ago
0ea66dc260
Fixed bad merge from Master
7 years ago
1172ff62e1
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_demo.cpp
# imgui_internal.h
7 years ago
3cc10d25a9
BeginPopupContextItem(), BeginPopupContextWindow(): Using newly introduced IsItemHovered() flags to allow reopening another context menu (over same or not same item) with right-click. ( #439 ) (+1 squashed commits)
7 years ago
695ea45fca
IsWindowHovered(): Changed default behavior to now return false is a widget from another window is active + Added support for ImGuiHoveredFlags_AllowWhenBlockedByActiveItem. (relate to drag'n drop idoms: #143 )
7 years ago
564ff2dfd3
IsItemHovered(), IsWindowHovered(): added flags to enable various and more specific behavior. Will enable improvements for popups/context menus and drag'n drop. (relate ~#439, #1013 , #143 , #925 )
...
The legacy confusing IsItemRectHovered(), IsWindowRectHovered() can be completely removed now.
Changed IsWindowHovered() behavior with default parameter: it now return false is the window is blocked by a popup.
Demo: Added tests for those two functions.
7 years ago
d29a6a5a5a
Moved IMGUI_DISABLE_OBSOLETE_FUNCTIONS block lower in the imgui.h file so obsolete functions can use flags. Also sane to quarantine them outside of the respectable area.
7 years ago
e6f06627e9
Made the ImGuiWindowFlags_NoMove flag inherited from parent to child, so in a setup with RootWindow (no flag) -> Child (NoMove flag) -> SubChild (no flag) user won't be able to move the root window by clicking on SubChild. ( #1381 )
7 years ago
3b485cda51
Fixed a bug allowing to move a _NoMove window from a child that doesn't have the flag. ( #1381 )
...
broken by e56eba44fe#1337 )
7 years ago
87ae40843c
Popups: popups can be closed with a right-click anywhere, without altering focus under the popup.(~#439)
7 years ago
853018dd4d
Popups: Fixed a bug introduced in 1a35766356 which made the BeginPopupContextXXX functions create popups without border. (nb: all that border mess is going away in styling clean up)
7 years ago
5f7299e15a
Refactor EndFrame() code that process focusing window with left mouse button. This commit should be no-op.
7 years ago
51eed2f257
Merge branch 'master' into navigation
7 years ago
5b699517d4
Internals: PaintVerts** renamed to ShadeVerts**, moved to imgui_draw.cpp and exposed in imgui_internal.h (+1 squashed commits)
7 years ago
22977ffedb
Documentation: Extra comments + tweaks to make usage of long-line more bearable.
7 years ago
938f1b720f
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
7 years ago
370a48c10b
Internals: RenderCollapseTriangle() -> RenderTriangle(), takes a ImGuiDir
7 years ago
a03093b2d4
CollapsingHeader(bool*) variant: fixed for IsItemHovered() to work properly in the nav branch.Basically the close button now has to use ItemAdd() to be navable into, which overwrite the IsItemHovered data. ( #600 , #787 )
7 years ago
29a652adee
CollapsingHeader(bool*) variant: fixed for IsItemHovered() to work properly in the nav branch.Basically the close button now has to use ItemAdd() to be navable into, which overwrite the IsItemHovered data. ( #600 , #787 )
7 years ago
a126c702d9
Merge branch 'master' into navigation
...
# Conflicts:
# imgui_internal.h
7 years ago
ef3f87eec5
Internals: ButtonBehavior: made ImGuiButtonFlags_PressedOnClick and ImGuiButtonFlags_PressedOnDoubleClick set the click offset correctly + hold on g.ActiveId so Held state can be reported. Added ImGuiButtonFlags_NoHoldingActiveId flag to disable the later.
7 years ago
bf778ebb7e
Checkbox: Using checkmark. MenuItem: Tweaked checkmark, thicker.
7 years ago
d96b6ecf88
Merge branch 'master' into navigation
...
# Conflicts:
# imgui_demo.cpp
7 years ago
03b76bf05b
Begin: Marked 5 parameters version of Begin() as obsolete. Now waiting for a riot to happen!
7 years ago
78a85ba3fe
Begin: Work toward obsoleting the 5-arguments Begin() overload. Internal BeginEx() becomes the normal public Begin() again! (4)
7 years ago
2739b6ebcd
Begin: Work toward obsoleting the 5-arguments Begin() overload. Removed bg_alpha from internal BeginEx(). (3)
7 years ago
4aa9d2089d
Begin: Work toward obsoleting the 5-arguments Begin() overload. Removed size_on_first_use from internal BeginEx(). (2)
7 years ago
55d873875e
Begin: Work toward obsoleting the 5-arguments Begin() overload. (1)
7 years ago
1a35766356
BeginPopupContextItem() now supports a NULL string identifier and uses the last item ID if available. For interactive items (that have an ID) this works! For non interactive items we assert.
7 years ago
c76f014292
Fix IsItemHovered() issue on child by temporarily reverting 344d48be31. This is not the ideal solution. ( Fix #1370 )
7 years ago
af565ea828
Nav: InputTextMultiline: Fixed navigation/selection. Disabled selecting all when activating a multi-line text editor. ( #787 )
7 years ago
7ea52ac1e4
Nav: InputTextMultiline: Fixed navigation/selection. Disabled selecting all when activating a multi-line text editor. ( #787 )
7 years ago
82a27fd3aa
Nav: InputText: Fixed using Up/Down history callback feature when Nav is enabled ( #787 )
7 years ago
b70c2fa887
Nav: Internals: Moved some internal code to namespace, comments
7 years ago
ae1866c424
Nav: NavProcessItem() updates current NavLayer. Basically we're hearing toward rebuilidng nav info from an id. ( #787 ).
7 years ago
97851f7376
Nav: NavProcessItem() computes window-relative rectangle using own Window rather than NavWindow. Not sure what it may mean for child-flattened-nav (disabled). ( #787 )
7 years ago
7d14262202
Nav: SetFocusID() update NavWindow and NavRectRel just as we get them. Needed by upcoming commit, committing separately as I'm curious if it has any side-effect. ( #787 )
7 years ago
83416fa5da
Merge branch 'master' into navigation
7 years ago
d761825cfb
Nav: Renaming a field + Comments.
7 years ago
ce7b04e8b9
Removed apparently unncessary code in InputFloatN() and InputInt().
7 years ago
db5f1b79cd
Nav: ButtonBehavior() keep _displaying_ NavId item as howered when refocusing or moving window, which is consistent with IsItemHovered() and reduce noise/flicker ( #787 )
7 years ago
c42baf392a
Reluctantly exposed GetActiveID(), GetHoveredID() in imgui_internal because the demo code will need it.
7 years ago
53780a4fcc
Nav: Shallow tweaks.
7 years ago
f852b9a52a
Exposed Scrollbar() in imgui_internal.h and removed a bool arg
7 years ago
b667d5a9e7
Nav: Internals: Renamed ImGuiButtonFlags_NoNavOverride to ImGuiButtonFlags_NoNavFocus + fixed a theorically missing test in ButtonBehavior() ( #787 )
7 years ago
0371219222
Nav: Internals: Renamed SetActiveIDNoNav -> SetActiveID() and old SetActiveID() -> SetFocusID(), both functions needs to be called when both are desirabled. ( #787 )
...
May break code relying on imgui_internal.h, relying on nav and not calling ButtonBehavior().
7 years ago
8b095e483b
Internals: Moved SetNavID() and renamed casing to be consistent with stuff exposed in imgui_internal.h
7 years ago
4be967823f
Exposed Scrollbar() in imgui_internal.h and removed a bool arg
7 years ago
48498b337d
Internals: SetActiveID window cannot be NULL
7 years ago
4548bcb5c9
Nav: commiting shallow bits to reduce noise from working copy/upcoming commit.
7 years ago
17519c313a
Nav: Extract part of NavUpdate() into a saner NavUpdateWindowingTarget() ( #787 )
7 years ago
b05b31e690
Nav: Made NavWindow always refresh from NavId so we can lazily retrieve the window for user functions that don't have it. This is not required by current commit but I'd rather test it earlier. Idea: eventually if we switch to 64-bit identifiers we could reserve e.g. 20 bits to store a simplified window identifier so we can always retrieve a window from an id. ( #787 )
7 years ago
f0d437dd9c
Nav: SetActiveId() uses SetActiveIDNoNav() to avoid duplicating logic. ( #787 )
7 years ago
2047c58efb
Nav: Extract part of NavUpdate() into a saner NavScrollToBringItemIntoView() ( #787 )
7 years ago
7a14d7dfdc
Nav: More consistently drawing a (thin) navigation rectangle hover filled frames such as tree nodes, collapsing header, menus. ( #787 )
7 years ago
3833f1f7a2
Merge branch 'master' into navigation
7 years ago
43b4a81b3e
Rnamed AlignFirstTextHeightToWidgets() to AlignTextToFramePadding(). Kept inline redirection function (will obsolete).
7 years ago
c6e370a77a
TreeNode: Added ImGuiTreeNodeFlags_FramePadding flag
7 years ago
69dd895358
Nav: Renaming NavInitDefaultRequest -> NavInitRequest
7 years ago
4d83078885
Nav: Moving code next to its peers
7 years ago
d2975115cd
Nav: Caching into g.NavAnyRequest to minimize hot path cost (and so we can add many more request sources)
7 years ago
d91b093be6
Nav: Minor tweaks in NavProcessItem() used by ItemAdd()
7 years ago
c3105919ba
Nav: Minor tweaks also toward removing processing from ItemAdd()
7 years ago
d16309ca77
Internal: ItemAdd() minor shallow tweaks
7 years ago
64ce83b9ed
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
7 years ago
042153d254
Internal: ItemAdd(), IsClippedEx(): removed unnecessary indirection for ID parameter
7 years ago
acb6f12d2c
Removed extraneous calls to GetCurrentWindowRead() when we already have a ImGuiContext. Internal RenderXXX functions also don't need to write into the Accessed field at all.
7 years ago
6e1199c603
Merge branch 'master' into navigation
7 years ago
f451785c9e
Nav: Shuffled code in ItemAdd() so that NavProcessItem() may have access to LastItemId (will be required by tabbing)
7 years ago
e12cfa9dfd
Nav: Minor midying up and comments,
7 years ago
40df7a5155
Nav: Removed possibly redundant test prior to calling NavProcessItem() from ItemAdd()
7 years ago
a77dd02e8a
Nav: Moving code next to its peers
7 years ago
f5bd4663dd
Nav: Moving the big chunk of code from ItemAdd() to NavProcessItem()
7 years ago
59c6f35bf6
Added ActivateItem(), GetItemID() functions.
7 years ago
80c4e2fe7b
Nav: Tidying up activation mechanism so that setting NavActivateId can trigger buttons.
7 years ago
d851775c80
ColorButton: Reduced bordering artefact that would be particularly visible with opaque Col_FrameBg and FrameRounding enabled.
7 years ago
726dcf0dd2
TextUnformatted(): minor tweak
7 years ago
a0d724b450
Made AlignFirstTextHeightToWidgets() saner and faster (still disliking its name very much!)
7 years ago
a3d0755181
Merge branch 'master' into navigation
7 years ago
f326fac64a
Nav: Menus and popups now have move request wrap around vertically (using the move request forward thing added recently). ( #787 )
7 years ago
a8788e51a7
SetKeyboardFocusHere() added assert to prevent passing values smaller than -1 as we may have to outlaw them (I think nobody was using that)
7 years ago
63cd2bf9b1
Removed obsolete comment.
7 years ago
3ddcdcf6e7
Merge branch 'master' into navigation
7 years ago
67ac7da30f
Styles: Added ImGuiStyle::ScaleAllSizes(float) helper to make it easier to have application transition to e.g. High DPI with a matching style.
7 years ago
a56b71e866
Nav: Added code to render thin highlight type. ( #787 )
7 years ago
b36a043bbf
typo
7 years ago
6ea90af6b7
Nav: Highlight clipped within host window then extruded out. ( #787 )
7 years ago
cb4e6c8212
Nav: Selectable(): activating selectable also sets NavId + removed the MouseDelta test (added in 43ee5d73e9, #323 ) as I don't think it is needed. ( #787 )
7 years ago
64a51327d3
Nav: Added NavMoveResultParentId internal info to record when the parent/context of a given NavId. Useful for various algorithms (currently looking at range selection stuff) ( #787 )
7 years ago
74da533c93
Nav: Added NavJustNavigatedId internal info to record when we land on a given item after a navigation request, useful for various algorithms (currently looking at range selection stuff) ( #787 )
7 years ago
7f58bb03c1
Changed the internal name formatting of child windows to use slashes as separator, more readable.
7 years ago
cbc9730798
Metrics: Draw window bounding boxes when hovering Pos/Size. List all draw layers, trimming empty commands like Render() does.
7 years ago
491edfd8d8
Nav: Fixed a crash introduced yesterday.
7 years ago
0046c618b0
Nav: Allow to collapse tree nodes with NavLeft and open them with NavRight ( #787 , #1079 )
7 years ago
ecd72cc0c7
Nav: Disabled the final axial check when considering candidates in most situations except menubars.
...
It's definitively undesirable inside Menu as we want to catch nav request failures reliably.
I think it may be considered as an option if we find this desirable i some circumstances. Right now ideally I'd remove it totally but with current scoring setup, without it we can't easily reach the Window Close button. (#787 )
7 years ago
88a354585a
Nav: It's now possible to navigate sibling of a menu-bar while navigating inside one of their child. If a Left<>Right navigation request fails to find a match we forward the request to the root menu. ( #787 , #126 )
...
Currently the sibling menu is isn't automatically opened, that's still left to it (and even that can be anoying in Windows when the first menu-item is a child menu)
7 years ago
f4e4c38705
BeginMenu(): fixed logic to distinguish vertical menu from one layed out in a menu bar. Makes MenuItem() in a regular window behave more consistently, and this will be also needed by upcoming menu-navigation changes in the nav branch. ( #126 , #787 )
7 years ago
9912f7eef8
BeginMenu(): fixed logic to distinguish vertical menu from one layed out in a menu bar. Makes MenuItem() in a regular window behave more consistently, and this will be also needed by upcoming menu-navigation changes in the nav branch. ( #126 , #787 )
7 years ago
cf3b21179b
Nav: Comments
7 years ago
5a9ebeca9e
Nav: Fix typo from 9712a81f85
7 years ago
omar
matiTechno