asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Fix to update scroll bar has correct max value in ScrollContainer

Browse source 
(cherry picked from commit 67c2f2445f)
This commit is contained in:
volzhs 2020-11-25 05:30:55 +09:00 • committed by Rémi Verschelde
parent 9706b78a3f
commit 8aeeec034d
No known key found for this signature in database
GPG key ID: C3336907360768E1
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
scene/gui/scroll_container.cpp
View file

@ -421,6 +421,7 @@ void ScrollContainer::update_scrollbars() {
bool hide_scroll_v = !scroll_v || min.height <= size.height;
bool hide_scroll_h = !scroll_h || min.width <= size.width;
v_scroll->set_max(min.height);
if (hide_scroll_v) {
v_scroll->hide();
@ -428,7 +429,6 @@ void ScrollContainer::update_scrollbars() {
} else {
v_scroll->show();
v_scroll->set_max(min.height);
if (hide_scroll_h) {
v_scroll->set_page(size.height);
} else {
@ -438,6 +438,7 @@ void ScrollContainer::update_scrollbars() {
scroll.y = v_scroll->get_value();
}
h_scroll->set_max(min.width);
if (hide_scroll_h) {
h_scroll->hide();
@ -445,7 +446,6 @@ void ScrollContainer::update_scrollbars() {
} else {
h_scroll->show();
h_scroll->set_max(min.width);
if (hide_scroll_v) {
h_scroll->set_page(size.width);
} else {