mirror of
https://github.com/ocornut/imgui.git
synced 2026-09-26 16:05:45 +03:00
Merge 3dffd41ccb into e728936797
This commit is contained in:
commit
1e99160a68
1 changed files with 1 additions and 1 deletions
|
|
@ -12117,7 +12117,7 @@ ImVec2 ImGui::ScrollToRectEx(ImGuiWindow* window, const ImRect& item_rect, ImGui
|
|||
ImGuiScrollFlags in_flags = flags;
|
||||
if ((flags & ImGuiScrollFlags_MaskX_) == 0 && window->ScrollbarX)
|
||||
flags |= ImGuiScrollFlags_KeepVisibleEdgeX;
|
||||
if ((flags & ImGuiScrollFlags_MaskY_) == 0)
|
||||
if ((flags & ImGuiScrollFlags_MaskY_) == 0 && window->ScrollbarY)
|
||||
flags |= window->Appearing ? ImGuiScrollFlags_AlwaysCenterY : ImGuiScrollFlags_KeepVisibleEdgeY;
|
||||
|
||||
const bool fully_visible_x = item_rect.Min.x >= scroll_rect.Min.x && item_rect.Max.x <= scroll_rect.Max.x;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue