godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-21 14:57:09 +00:00
Code Releases Wiki Activity

Fix overlapping scrollbars in ScrollContainer (#33309)

Browse Source
This commit is contained in:
malbach
2020-01-13 12:13:00 +01:00
parent 52f44e72b6
commit bc8ce836e3
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
scene/gui/scroll_container.cpp
View File

@@ -420,6 +420,9 @@ void ScrollContainer::update_scrollbars() {
v_scroll->hide(); v_scroll->hide();
scroll.y = 0; scroll.y = 0;
// modify the horizontal scrollbar's right anchor to fill the container's width
h_scroll->set_anchor_and_margin(MARGIN_RIGHT, ANCHOR_END, 0);
} else { } else {
v_scroll->show(); v_scroll->show();
@@ -431,12 +434,18 @@ void ScrollContainer::update_scrollbars() {
} }
scroll.y = v_scroll->get_value(); scroll.y = v_scroll->get_value();
// modify the horizontal scrollbar's right anchor to stop at the left of the vertical scrollbar
h_scroll->set_anchor_and_margin(MARGIN_RIGHT, ANCHOR_END, -vmin.width);
} }
if (hide_scroll_h) { if (hide_scroll_h) {
h_scroll->hide(); h_scroll->hide();
scroll.x = 0; scroll.x = 0;
// modify the vertical scrollbar's bottom anchor to fill the container's height
v_scroll->set_anchor_and_margin(MARGIN_BOTTOM, ANCHOR_END, 0);
} else { } else {
h_scroll->show(); h_scroll->show();
@@ -448,6 +457,9 @@ void ScrollContainer::update_scrollbars() {
} }
scroll.x = h_scroll->get_value(); scroll.x = h_scroll->get_value();
// modify the vertical scrollbar's bottom anchor to stop at the top of the horizontal scrollbar
v_scroll->set_anchor_and_margin(MARGIN_BOTTOM, ANCHOR_END, -hmin.height);
} }
} }