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

Fix scrolling behaviour with low page value 

(cherry picked from commit 1608bea188)
This commit is contained in:
Paweł 2022-10-26 19:43:50 +02:00 committed by Yuri Sizov
parent 5262fe21de
commit ca0ba83f03
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scene/gui/scroll_bar.cpp
View File

@ -55,12 +55,14 @@ void ScrollBar::gui_input(const Ref<InputEvent> &p_event) {
accept_event(); accept_event();
if (b->get_button_index() == MouseButton::WHEEL_DOWN && b->is_pressed()) { if (b->get_button_index() == MouseButton::WHEEL_DOWN && b->is_pressed()) {
set_value(get_value() + get_page() / 4.0); double change = get_page() != 0.0 ? get_page() / 4.0 : (get_max() - get_min()) / 16.0;
set_value(get_value() + MAX(change, get_step()));
accept_event(); accept_event();
} }
if (b->get_button_index() == MouseButton::WHEEL_UP && b->is_pressed()) { if (b->get_button_index() == MouseButton::WHEEL_UP && b->is_pressed()) {
set_value(get_value() - get_page() / 4.0); double change = get_page() != 0.0 ? get_page() / 4.0 : (get_max() - get_min()) / 16.0;
set_value(get_value() - MAX(change, get_step()));
accept_event(); accept_event();
} }
@ -99,7 +101,8 @@ void ScrollBar::gui_input(const Ref<InputEvent> &p_event) {
if (scrolling) { if (scrolling) {
target_scroll = CLAMP(target_scroll - get_page(), get_min(), get_max() - get_page()); target_scroll = CLAMP(target_scroll - get_page(), get_min(), get_max() - get_page());
} else { } else {
target_scroll = CLAMP(get_value() - get_page(), get_min(), get_max() - get_page()); double change = get_page() != 0.0 ? get_page() : (get_max() - get_min()) / 16.0;
target_scroll = CLAMP(get_value() - change, get_min(), get_max() - get_page());
} }
if (smooth_scroll_enabled) { if (smooth_scroll_enabled) {
@ -122,7 +125,8 @@ void ScrollBar::gui_input(const Ref<InputEvent> &p_event) {
if (scrolling) { if (scrolling) {
target_scroll = CLAMP(target_scroll + get_page(), get_min(), get_max() - get_page()); target_scroll = CLAMP(target_scroll + get_page(), get_min(), get_max() - get_page());
} else { } else {
target_scroll = CLAMP(get_value() + get_page(), get_min(), get_max() - get_page()); double change = get_page() != 0.0 ? get_page() : (get_max() - get_min()) / 16.0;
target_scroll = CLAMP(get_value() + change, get_min(), get_max() - get_page());
} }
if (smooth_scroll_enabled) { if (smooth_scroll_enabled) {