mirror of
https://github.com/Drezil/imgui.git
synced 2024-11-15 01:17:00 +00:00
Internal: ItemAdd() minor shallow tweaks
This commit is contained in:
parent
64ce83b9ed
commit
d16309ca77
15
imgui.cpp
15
imgui.cpp
@ -2226,23 +2226,24 @@ bool ImGui::ItemAdd(const ImRect& bb, ImGuiID id, const ImRect* nav_bb_arg)
|
|||||||
ImGuiContext& g = *GImGui;
|
ImGuiContext& g = *GImGui;
|
||||||
ImGuiWindow* window = g.CurrentWindow;
|
ImGuiWindow* window = g.CurrentWindow;
|
||||||
|
|
||||||
// Navigation processing runs prior to clipping early-out
|
|
||||||
// (a) So that NavInitDefaultRequest can be honored, for newly opened windows to select a default widget
|
|
||||||
// (b) So that we can scroll up/down past clipped items. This adds a small O(N) cost to regular navigation requests unfortunately, but it is still limited to one window.
|
|
||||||
// it may not scale very well for windows with ten of thousands of item, but at least NavMoveRequest is only set on user interaction, aka maximum once a frame.
|
|
||||||
// We could early out with `if (is_clipped && !g.NavInitDefaultRequest) return false;` but when we wouldn't be able to reach unclipped widgets. This would work if user had explicit scrolling control (e.g. mapped on a stick)
|
|
||||||
if (id != 0)
|
if (id != 0)
|
||||||
{
|
{
|
||||||
|
// Navigation processing runs prior to clipping early-out
|
||||||
|
// (a) So that NavInitDefaultRequest can be honored, for newly opened windows to select a default widget
|
||||||
|
// (b) So that we can scroll up/down past clipped items. This adds a small O(N) cost to regular navigation requests unfortunately, but it is still limited to one window.
|
||||||
|
// it may not scale very well for windows with ten of thousands of item, but at least NavMoveRequest is only set on user interaction, aka maximum once a frame.
|
||||||
|
// We could early out with `if (is_clipped && !g.NavInitDefaultRequest) return false;` but when we wouldn't be able to reach unclipped widgets. This would work if user had explicit scrolling control (e.g. mapped on a stick)
|
||||||
window->DC.NavLayerActiveMaskNext |= (1 << window->DC.NavLayerCurrent);
|
window->DC.NavLayerActiveMaskNext |= (1 << window->DC.NavLayerCurrent);
|
||||||
if (g.NavWindow == window->RootNavWindow)
|
if (g.NavWindow == window->RootNavWindow)
|
||||||
if (g.NavId == id || g.NavMoveRequest || g.NavInitDefaultRequest || IMGUI_DEBUG_NAV)
|
if (g.NavId == id || g.NavMoveRequest || g.NavInitDefaultRequest || IMGUI_DEBUG_NAV)
|
||||||
NavProcessItem(window, nav_bb_arg ? *nav_bb_arg : bb, id);
|
NavProcessItem(window, nav_bb_arg ? *nav_bb_arg : bb, id);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Clipping test + store basic information about the current item.
|
|
||||||
const bool is_clipped = IsClippedEx(bb, id, false);
|
|
||||||
window->DC.LastItemId = id;
|
window->DC.LastItemId = id;
|
||||||
window->DC.LastItemRect = bb;
|
window->DC.LastItemRect = bb;
|
||||||
|
|
||||||
|
// Clipping test
|
||||||
|
const bool is_clipped = IsClippedEx(bb, id, false);
|
||||||
if (is_clipped)
|
if (is_clipped)
|
||||||
{
|
{
|
||||||
window->DC.LastItemRectHoveredRect = false;
|
window->DC.LastItemRectHoveredRect = false;
|
||||||
|
Loading…
Reference in New Issue
Block a user