mirror of
https://github.com/ocornut/imgui.git
synced 2026-01-09 23:54:20 +00:00
Scroll : Dont scroll Y when scrollbar disabled
This commit is contained in:
parent
b6614f6c7c
commit
3dffd41ccb
1 changed files with 1 additions and 1 deletions
|
|
@ -11591,7 +11591,7 @@ ImVec2 ImGui::ScrollToRectEx(ImGuiWindow* window, const ImRect& item_rect, ImGui
|
||||||
ImGuiScrollFlags in_flags = flags;
|
ImGuiScrollFlags in_flags = flags;
|
||||||
if ((flags & ImGuiScrollFlags_MaskX_) == 0 && window->ScrollbarX)
|
if ((flags & ImGuiScrollFlags_MaskX_) == 0 && window->ScrollbarX)
|
||||||
flags |= ImGuiScrollFlags_KeepVisibleEdgeX;
|
flags |= ImGuiScrollFlags_KeepVisibleEdgeX;
|
||||||
if ((flags & ImGuiScrollFlags_MaskY_) == 0)
|
if ((flags & ImGuiScrollFlags_MaskY_) == 0 && window->ScrollbarY)
|
||||||
flags |= window->Appearing ? ImGuiScrollFlags_AlwaysCenterY : ImGuiScrollFlags_KeepVisibleEdgeY;
|
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;
|
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