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

Merge pull request #11372 from volzhs/fix-smooth-scroll

Browse source 
Fix smooth scrolling in ScrollBar
This commit is contained in:
Rémi Verschelde 2017-09-18 20:04:39 +02:00 committed by GitHub
commit 30ba4076cd
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
scene/gui/scroll_bar.cpp
View file

@ -106,9 +106,9 @@ void ScrollBar::_gui_input(Ref<InputEvent> p_event) {
if (ofs < grabber_ofs) { if (ofs < grabber_ofs) {
if (scrolling) { if (scrolling) {
target_scroll = target_scroll - get_page(); target_scroll = CLAMP(target_scroll - get_page(), get_min(), get_max() - get_page());
} else { } else {
target_scroll = get_value() - get_page(); target_scroll = CLAMP(get_value() - get_page(), get_min(), get_max() - get_page());
} }
if (smooth_scroll_enabled) { if (smooth_scroll_enabled) {
@ -130,9 +130,9 @@ void ScrollBar::_gui_input(Ref<InputEvent> p_event) {
update(); update();
} else { } else {
if (scrolling) { if (scrolling) {
target_scroll = target_scroll + get_page(); target_scroll = CLAMP(target_scroll + get_page(), get_min(), get_max() - get_page());
} else { } else {
target_scroll = get_value() + get_page(); target_scroll = CLAMP(get_value() + get_page(), get_min(), get_max() - get_page());
} }
if (smooth_scroll_enabled) { if (smooth_scroll_enabled) {