Merge 3dffd41ccbfba62bd401e030c489094de336d52c into a1af3c1a59fe81f7a1cac10dcead0a383b99f245

This commit is contained in:
Ryzee119 2026-11-05 11:45:34 +01:00 committed by GitHub
commit 00510069f6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -12204,7 +12204,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;