diff options
Diffstat (limited to 'scene/gui/scroll_container.cpp')
| -rw-r--r-- | scene/gui/scroll_container.cpp | 6 | 
1 files changed, 4 insertions, 2 deletions
diff --git a/scene/gui/scroll_container.cpp b/scene/gui/scroll_container.cpp index 28292309b9..e50a71b0ff 100644 --- a/scene/gui/scroll_container.cpp +++ b/scene/gui/scroll_container.cpp @@ -368,8 +368,10 @@ void ScrollContainer::update_scrollbars() {  	Ref<StyleBox> sb = get_stylebox("bg");  	size -= sb->get_minimum_size(); -	Size2 hmin = h_scroll->get_combined_minimum_size(); -	Size2 vmin = v_scroll->get_combined_minimum_size(); +	Size2 hmin; +	Size2 vmin; +	if (scroll_h) hmin = h_scroll->get_combined_minimum_size(); +	if (scroll_v) vmin = v_scroll->get_combined_minimum_size();  	Size2 min = child_max_size;  |