godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #12903 from YeldhamDev/scrollcontainer_arrangement

Browse Source 
Small arrangement in ScrollContainer
This commit is contained in:
Rémi Verschelde 2017-11-13 21:28:32 +01:00 committed by GitHub
commit 3c64635003
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
scene/gui/scroll_container.cpp
View File

@ -347,11 +347,10 @@ void ScrollContainer::update_scrollbars() {
} else { } else {
v_scroll->show(); v_scroll->show();
scroll.y = v_scroll->get_value();
}
v_scroll->set_max(min.height); v_scroll->set_max(min.height);
v_scroll->set_page(size.height - hmin.height); v_scroll->set_page(size.height - hmin.height);
scroll.y = v_scroll->get_value();
}
if (!scroll_h || min.width <= size.width - vmin.width) { if (!scroll_h || min.width <= size.width - vmin.width) {