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

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

View file

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