From d2c3fdaec0ef952e033d6d4dc2612b718eca52a0 Mon Sep 17 00:00:00 2001 From: fish Date: Tue, 4 Nov 2025 17:45:37 -0800 Subject: [PATCH] Make scrollbar margins affect minimum size --- scene/gui/scroll_container.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scene/gui/scroll_container.cpp b/scene/gui/scroll_container.cpp index 8edd27ba12f..70c839f7ce6 100644 --- a/scene/gui/scroll_container.cpp +++ b/scene/gui/scroll_container.cpp @@ -61,7 +61,7 @@ Size2 ScrollContainer::get_minimum_size() const { min_size.x = largest_child_min_size.x; bool v_scroll_show = vertical_scroll_mode == SCROLL_MODE_SHOW_ALWAYS || vertical_scroll_mode == SCROLL_MODE_RESERVE || (vertical_scroll_mode == SCROLL_MODE_AUTO && largest_child_min_size.y > size.y); if (v_scroll_show && v_scroll->get_parent() == this) { - min_size.x += v_scroll->get_minimum_size().x; + min_size.x += v_scroll->get_minimum_size().x + theme_cache.scrollbar_h_separation; } } @@ -69,7 +69,7 @@ Size2 ScrollContainer::get_minimum_size() const { min_size.y = largest_child_min_size.y; bool h_scroll_show = horizontal_scroll_mode == SCROLL_MODE_SHOW_ALWAYS || horizontal_scroll_mode == SCROLL_MODE_RESERVE || (horizontal_scroll_mode == SCROLL_MODE_AUTO && largest_child_min_size.x > size.x); if (h_scroll_show && h_scroll->get_parent() == this) { - min_size.y += h_scroll->get_minimum_size().y; + min_size.y += h_scroll->get_minimum_size().y + theme_cache.scrollbar_v_separation; } }