aboutsummaryrefslogtreecommitdiff
path: root/scene/gui/scroll_container.cpp
diff options
context:
space:
mode:
authorkubecz3k2017-08-15 22:55:49 +0200
committerGitHub2017-08-15 22:55:49 +0200
commit129ebca41d8ed85830580c593eafa2a8637cb5be (patch)
treef357e95da9894f88b6c6910a087a710b2a62b64b /scene/gui/scroll_container.cpp
parentaa24ddc59f723ba51ea752d32f092ca5e7b6b9e3 (diff)
parent0041e08f747f5d29ca7fbc65eb86175983aa84af (diff)
downloadgodot-129ebca41d8ed85830580c593eafa2a8637cb5be.tar.gz
godot-129ebca41d8ed85830580c593eafa2a8637cb5be.tar.zst
godot-129ebca41d8ed85830580c593eafa2a8637cb5be.zip
Merge pull request #9889 from groud/control_enhancements
Control node enhancements
Diffstat (limited to 'scene/gui/scroll_container.cpp')
-rw-r--r--scene/gui/scroll_container.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/scene/gui/scroll_container.cpp b/scene/gui/scroll_container.cpp
index cc1a637d2..939bdd8d0 100644
--- a/scene/gui/scroll_container.cpp
+++ b/scene/gui/scroll_container.cpp
@@ -187,14 +187,14 @@ void ScrollContainer::_update_scrollbar_pos() {
Size2 hmin = h_scroll->get_combined_minimum_size();
Size2 vmin = v_scroll->get_combined_minimum_size();
- v_scroll->set_anchor_and_margin(MARGIN_LEFT, ANCHOR_END, vmin.width);
+ v_scroll->set_anchor_and_margin(MARGIN_LEFT, ANCHOR_END, -vmin.width);
v_scroll->set_anchor_and_margin(MARGIN_RIGHT, ANCHOR_END, 0);
v_scroll->set_anchor_and_margin(MARGIN_TOP, ANCHOR_BEGIN, 0);
v_scroll->set_anchor_and_margin(MARGIN_BOTTOM, ANCHOR_END, 0);
h_scroll->set_anchor_and_margin(MARGIN_LEFT, ANCHOR_BEGIN, 0);
h_scroll->set_anchor_and_margin(MARGIN_RIGHT, ANCHOR_END, 0);
- h_scroll->set_anchor_and_margin(MARGIN_TOP, ANCHOR_END, hmin.height);
+ h_scroll->set_anchor_and_margin(MARGIN_TOP, ANCHOR_END, -hmin.height);
h_scroll->set_anchor_and_margin(MARGIN_BOTTOM, ANCHOR_END, 0);
h_scroll->raise();