diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-11-16 15:15:23 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-16 15:15:23 +0100 |
| commit | 2d7fe9b298869e46dff1526e1bcbc0bb145c340e (patch) | |
| tree | 09f15e04ff6b9afc0240319ebc3a2870d110eef4 | |
| parent | bb9127a78bd1035b1ee8797323138844b622211e (diff) | |
| parent | 554b3f77c797df59abb0446c346a590d3f50b703 (diff) | |
Merge pull request #23735 from pshe94/master
Use VScrollBar when calculating horiz. offset in ScrollContainer
| -rw-r--r-- | scene/gui/scroll_container.cpp | 2 |
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++) { |