summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpshe94 <pshela94@gmail.com>2018-11-16 02:47:43 +0100
committerGitHub <noreply@github.com>2018-11-16 02:47:43 +0100
commit554b3f77c797df59abb0446c346a590d3f50b703 (patch)
tree06907203ae25a2b9ce7e159f3c2b74b68e3d3713
parent26d33d1c6eedf9271bac20a24ea37453c21ef890 (diff)
Use VScrollBar when calculating horiz. offset in ScrollContainer
Someone forgot to change `h_scroll` to `v_scroll` when copy-pasting the code ;)
-rw-r--r--scene/gui/scroll_container.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/gui/scroll_container.cpp b/scene/gui/scroll_container.cpp
index 26da16569a..9c22a049b8 100644
--- a/scene/gui/scroll_container.cpp
+++ b/scene/gui/scroll_container.cpp
@@ -246,7 +246,7 @@ void ScrollContainer::_notification(int p_what) {
size.y -= h_scroll->get_minimum_size().y;
if (v_scroll->is_visible_in_tree() && v_scroll->get_parent() == this) //scrolls may have been moved out for reasons
- size.x -= h_scroll->get_minimum_size().x;
+ size.x -= v_scroll->get_minimum_size().x;
for (int i = 0; i < get_child_count(); i++) {