Merge pull request #35180 from timothyqiu/scroll-container-min-size

Updates ScrollContainer min size when toggle scrollbars

Merge pull request #35180 from timothyqiu/scroll-container-min-size
2e66de0d · Rémi Verschelde · GitHub · b43101aa · 574918f3 · 2e66de0d
Unverified Commit 2e66de0d authored Jan 16, 2020 by Rémi Verschelde Committed by GitHub Jan 16, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 0 deletions

scroll_container.cpp scene/gui/scroll_container.cpp +8 -0

No files found.
--- a/scene/gui/scroll_container.cpp
+++ b/scene/gui/scroll_container.cpp
@@ -452,8 +452,12 @@ void ScrollContainer::_scroll_moved(float) {
 };

 void ScrollContainer::set_enable_h_scroll(bool p_enable) {
+	if (scroll_h == p_enable) {
+		return;
+	}

 	scroll_h = p_enable;
+	minimum_size_changed();
 	queue_sort();
 }

@@ -463,8 +467,12 @@ bool ScrollContainer::is_h_scroll_enabled() const {
 }

 void ScrollContainer::set_enable_v_scroll(bool p_enable) {
+	if (scroll_v == p_enable) {
+		return;
+	}

 	scroll_v = p_enable;
+	minimum_size_changed();
 	queue_sort();
 }