Merge pull request godotengine#105516 from tehKaiN/unify_scrollbar_scrollcontainer_scroll_delta

Repiteo · Repiteo · commit e8240fdd0028 · 2025-04-24T09:09:29.000-05:00
Unify ScrollBar/ScrollContainer scroll delta
diff --git a/scene/gui/scroll_bar.cpp b/scene/gui/scroll_bar.cpp
@@ -50,13 +50,13 @@ void ScrollBar::gui_input(const Ref<InputEvent> &p_event) {
 		accept_event();
 
 		if (b->get_button_index() == MouseButton::WHEEL_DOWN && b->is_pressed()) {
-			double change = get_page() != 0.0 ? get_page() / 4.0 : (get_max() - get_min()) / 16.0;
+			double change = ((get_page() != 0.0) ? get_page() / PAGE_DIVISOR : (get_max() - get_min()) / 16.0) * b->get_factor();
 			scroll(MAX(change, get_step()));
 			accept_event();
 		}
 
 		if (b->get_button_index() == MouseButton::WHEEL_UP && b->is_pressed()) {
-			double change = get_page() != 0.0 ? get_page() / 4.0 : (get_max() - get_min()) / 16.0;
+			double change = ((get_page() != 0.0) ? get_page() / PAGE_DIVISOR : (get_max() - get_min()) / 16.0) * b->get_factor();
 			scroll(-MAX(change, get_step()));
 			accept_event();
 		}
diff --git a/scene/gui/scroll_bar.h b/scene/gui/scroll_bar.h
@@ -110,6 +110,8 @@ class ScrollBar : public Range {
 	static void _bind_methods();
 
 public:
+	static inline const int PAGE_DIVISOR = 8;
+
 	void scroll(double p_amount);
 	void scroll_to(double p_position);
 
diff --git a/scene/gui/scroll_container.cpp b/scene/gui/scroll_container.cpp
@@ -129,19 +129,19 @@ void ScrollContainer::gui_input(const Ref<InputEvent> &p_gui_input) {
 			if (mb->get_button_index() == MouseButton::WHEEL_UP) {
 				// By default, the vertical orientation takes precedence. This is an exception.
 				if ((h_scroll_enabled && mb->is_shift_pressed()) || v_scroll_hidden) {
-					h_scroll->scroll(-h_scroll->get_page() / 8 * mb->get_factor());
+					h_scroll->scroll(-h_scroll->get_page() / ScrollBar::PAGE_DIVISOR * mb->get_factor());
 					scroll_value_modified = true;
 				} else if (v_scroll_enabled) {
-					v_scroll->scroll(-v_scroll->get_page() / 8 * mb->get_factor());
+					v_scroll->scroll(-v_scroll->get_page() / ScrollBar::PAGE_DIVISOR * mb->get_factor());
 					scroll_value_modified = true;
 				}
 			}
 			if (mb->get_button_index() == MouseButton::WHEEL_DOWN) {
 				if ((h_scroll_enabled && mb->is_shift_pressed()) || v_scroll_hidden) {
-					h_scroll->scroll(h_scroll->get_page() / 8 * mb->get_factor());
+					h_scroll->scroll(h_scroll->get_page() / ScrollBar::PAGE_DIVISOR * mb->get_factor());
 					scroll_value_modified = true;
 				} else if (v_scroll_enabled) {
-					v_scroll->scroll(v_scroll->get_page() / 8 * mb->get_factor());
+					v_scroll->scroll(v_scroll->get_page() / ScrollBar::PAGE_DIVISOR * mb->get_factor());
 					scroll_value_modified = true;
 				}
 			}
@@ -150,19 +150,19 @@ void ScrollContainer::gui_input(const Ref<InputEvent> &p_gui_input) {
 			if (mb->get_button_index() == MouseButton::WHEEL_LEFT) {
 				// By default, the horizontal orientation takes precedence. This is an exception.
 				if ((v_scroll_enabled && mb->is_shift_pressed()) || h_scroll_hidden) {
-					v_scroll->scroll(-v_scroll->get_page() / 8 * mb->get_factor());
+					v_scroll->scroll(-v_scroll->get_page() / ScrollBar::PAGE_DIVISOR * mb->get_factor());
 					scroll_value_modified = true;
 				} else if (h_scroll_enabled) {
-					h_scroll->scroll(-h_scroll->get_page() / 8 * mb->get_factor());
+					h_scroll->scroll(-h_scroll->get_page() / ScrollBar::PAGE_DIVISOR * mb->get_factor());
 					scroll_value_modified = true;
 				}
 			}
 			if (mb->get_button_index() == MouseButton::WHEEL_RIGHT) {
 				if ((v_scroll_enabled && mb->is_shift_pressed()) || h_scroll_hidden) {
-					v_scroll->scroll(v_scroll->get_page() / 8 * mb->get_factor());
+					v_scroll->scroll(v_scroll->get_page() / ScrollBar::PAGE_DIVISOR * mb->get_factor());
 					scroll_value_modified = true;
 				} else if (h_scroll_enabled) {
-					h_scroll->scroll(h_scroll->get_page() / 8 * mb->get_factor());
+					h_scroll->scroll(h_scroll->get_page() / ScrollBar::PAGE_DIVISOR * mb->get_factor());
 					scroll_value_modified = true;
 				}
 			}
@@ -250,10 +250,10 @@ void ScrollContainer::gui_input(const Ref<InputEvent> &p_gui_input) {
 	Ref<InputEventPanGesture> pan_gesture = p_gui_input;
 	if (pan_gesture.is_valid()) {
 		if (h_scroll_enabled) {
-			h_scroll->scroll(h_scroll->get_page() * pan_gesture->get_delta().x / 8);
+			h_scroll->scroll(h_scroll->get_page() * pan_gesture->get_delta().x / ScrollBar::PAGE_DIVISOR);
 		}
 		if (v_scroll_enabled) {
-			v_scroll->scroll(v_scroll->get_page() * pan_gesture->get_delta().y / 8);
+			v_scroll->scroll(v_scroll->get_page() * pan_gesture->get_delta().y / ScrollBar::PAGE_DIVISOR);
 		}
 
 		if (v_scroll->get_value() != prev_v_scroll || h_scroll->get_value() != prev_h_scroll) {
@@ -411,19 +411,19 @@ void ScrollContainer::_accessibility_action_scroll_set(const Variant &p_data) {
 }
 
 void ScrollContainer::_accessibility_action_scroll_up(const Variant &p_data) {
-	v_scroll->set_value(v_scroll->get_value() - v_scroll->get_page() / 8);
+	v_scroll->set_value(v_scroll->get_value() - v_scroll->get_page() / ScrollBar::PAGE_DIVISOR);
 }
 
 void ScrollContainer::_accessibility_action_scroll_down(const Variant &p_data) {
-	v_scroll->set_value(v_scroll->get_value() + v_scroll->get_page() / 8);
+	v_scroll->set_value(v_scroll->get_value() + v_scroll->get_page() / ScrollBar::PAGE_DIVISOR);
 }
 
 void ScrollContainer::_accessibility_action_scroll_left(const Variant &p_data) {
-	h_scroll->set_value(h_scroll->get_value() - h_scroll->get_page() / 8);
+	h_scroll->set_value(h_scroll->get_value() - h_scroll->get_page() / ScrollBar::PAGE_DIVISOR);
 }
 
 void ScrollContainer::_accessibility_action_scroll_right(const Variant &p_data) {
-	h_scroll->set_value(h_scroll->get_value() + h_scroll->get_page() / 8);
+	h_scroll->set_value(h_scroll->get_value() + h_scroll->get_page() / ScrollBar::PAGE_DIVISOR);
 }
 
 void ScrollContainer::_notification(int p_what) {

Original file line number	Diff line number	Diff line change
`@@ -50,13 +50,13 @@ void ScrollBar::gui_input(const Ref<InputEvent> &p_event) {`
`50`	`50`	`accept_event();`
`51`	`51`
`52`	`52`	`if (b->get_button_index() == MouseButton::WHEEL_DOWN && b->is_pressed()) {`
`53`		`- double change = get_page() != 0.0 ? get_page() / 4.0 : (get_max() - get_min()) / 16.0;`
	`53`	`+ double change = ((get_page() != 0.0) ? get_page() / PAGE_DIVISOR : (get_max() - get_min()) / 16.0) * b->get_factor();`
`54`	`54`	`scroll(MAX(change, get_step()));`
`55`	`55`	`accept_event();`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`if (b->get_button_index() == MouseButton::WHEEL_UP && b->is_pressed()) {`
`59`		`- double change = get_page() != 0.0 ? get_page() / 4.0 : (get_max() - get_min()) / 16.0;`
	`59`	`+ double change = ((get_page() != 0.0) ? get_page() / PAGE_DIVISOR : (get_max() - get_min()) / 16.0) * b->get_factor();`
`60`	`60`	`scroll(-MAX(change, get_step()));`
`61`	`61`	`accept_event();`
`62`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -129,19 +129,19 @@ void ScrollContainer::gui_input(const Ref<InputEvent> &p_gui_input) {`
`129`	`129`	`if (mb->get_button_index() == MouseButton::WHEEL_UP) {`
`130`	`130`	`// By default, the vertical orientation takes precedence. This is an exception.`
`131`	`131`	`if ((h_scroll_enabled && mb->is_shift_pressed()) \|\| v_scroll_hidden) {`
`132`		`- h_scroll->scroll(-h_scroll->get_page() / 8 * mb->get_factor());`
	`132`	`+ h_scroll->scroll(-h_scroll->get_page() / ScrollBar::PAGE_DIVISOR * mb->get_factor());`
`133`	`133`	`scroll_value_modified = true;`
`134`	`134`	`} else if (v_scroll_enabled) {`
`135`		`- v_scroll->scroll(-v_scroll->get_page() / 8 * mb->get_factor());`
	`135`	`+ v_scroll->scroll(-v_scroll->get_page() / ScrollBar::PAGE_DIVISOR * mb->get_factor());`
`136`	`136`	`scroll_value_modified = true;`
`137`	`137`	`}`
`138`	`138`	`}`
`139`	`139`	`if (mb->get_button_index() == MouseButton::WHEEL_DOWN) {`
`140`	`140`	`if ((h_scroll_enabled && mb->is_shift_pressed()) \|\| v_scroll_hidden) {`
`141`		`- h_scroll->scroll(h_scroll->get_page() / 8 * mb->get_factor());`
	`141`	`+ h_scroll->scroll(h_scroll->get_page() / ScrollBar::PAGE_DIVISOR * mb->get_factor());`
`142`	`142`	`scroll_value_modified = true;`
`143`	`143`	`} else if (v_scroll_enabled) {`
`144`		`- v_scroll->scroll(v_scroll->get_page() / 8 * mb->get_factor());`
	`144`	`+ v_scroll->scroll(v_scroll->get_page() / ScrollBar::PAGE_DIVISOR * mb->get_factor());`
`145`	`145`	`scroll_value_modified = true;`
`146`	`146`	`}`
`147`	`147`	`}`
`@@ -150,19 +150,19 @@ void ScrollContainer::gui_input(const Ref<InputEvent> &p_gui_input) {`
`150`	`150`	`if (mb->get_button_index() == MouseButton::WHEEL_LEFT) {`
`151`	`151`	`// By default, the horizontal orientation takes precedence. This is an exception.`
`152`	`152`	`if ((v_scroll_enabled && mb->is_shift_pressed()) \|\| h_scroll_hidden) {`
`153`		`- v_scroll->scroll(-v_scroll->get_page() / 8 * mb->get_factor());`
	`153`	`+ v_scroll->scroll(-v_scroll->get_page() / ScrollBar::PAGE_DIVISOR * mb->get_factor());`
`154`	`154`	`scroll_value_modified = true;`
`155`	`155`	`} else if (h_scroll_enabled) {`
`156`		`- h_scroll->scroll(-h_scroll->get_page() / 8 * mb->get_factor());`
	`156`	`+ h_scroll->scroll(-h_scroll->get_page() / ScrollBar::PAGE_DIVISOR * mb->get_factor());`
`157`	`157`	`scroll_value_modified = true;`
`158`	`158`	`}`
`159`	`159`	`}`
`160`	`160`	`if (mb->get_button_index() == MouseButton::WHEEL_RIGHT) {`
`161`	`161`	`if ((v_scroll_enabled && mb->is_shift_pressed()) \|\| h_scroll_hidden) {`
`162`		`- v_scroll->scroll(v_scroll->get_page() / 8 * mb->get_factor());`
	`162`	`+ v_scroll->scroll(v_scroll->get_page() / ScrollBar::PAGE_DIVISOR * mb->get_factor());`
`163`	`163`	`scroll_value_modified = true;`
`164`	`164`	`} else if (h_scroll_enabled) {`
`165`		`- h_scroll->scroll(h_scroll->get_page() / 8 * mb->get_factor());`
	`165`	`+ h_scroll->scroll(h_scroll->get_page() / ScrollBar::PAGE_DIVISOR * mb->get_factor());`
`166`	`166`	`scroll_value_modified = true;`
`167`	`167`	`}`
`168`	`168`	`}`
`@@ -250,10 +250,10 @@ void ScrollContainer::gui_input(const Ref<InputEvent> &p_gui_input) {`
`250`	`250`	`Ref<InputEventPanGesture> pan_gesture = p_gui_input;`
`251`	`251`	`if (pan_gesture.is_valid()) {`
`252`	`252`	`if (h_scroll_enabled) {`
`253`		`- h_scroll->scroll(h_scroll->get_page() * pan_gesture->get_delta().x / 8);`
	`253`	`+ h_scroll->scroll(h_scroll->get_page() * pan_gesture->get_delta().x / ScrollBar::PAGE_DIVISOR);`
`254`	`254`	`}`
`255`	`255`	`if (v_scroll_enabled) {`
`256`		`- v_scroll->scroll(v_scroll->get_page() * pan_gesture->get_delta().y / 8);`
	`256`	`+ v_scroll->scroll(v_scroll->get_page() * pan_gesture->get_delta().y / ScrollBar::PAGE_DIVISOR);`
`257`	`257`	`}`
`258`	`258`
`259`	`259`	`if (v_scroll->get_value() != prev_v_scroll \|\| h_scroll->get_value() != prev_h_scroll) {`
`@@ -411,19 +411,19 @@ void ScrollContainer::_accessibility_action_scroll_set(const Variant &p_data) {`
`411`	`411`	`}`
`412`	`412`
`413`	`413`	`void ScrollContainer::_accessibility_action_scroll_up(const Variant &p_data) {`
`414`		`- v_scroll->set_value(v_scroll->get_value() - v_scroll->get_page() / 8);`
	`414`	`+ v_scroll->set_value(v_scroll->get_value() - v_scroll->get_page() / ScrollBar::PAGE_DIVISOR);`
`415`	`415`	`}`
`416`	`416`
`417`	`417`	`void ScrollContainer::_accessibility_action_scroll_down(const Variant &p_data) {`
`418`		`- v_scroll->set_value(v_scroll->get_value() + v_scroll->get_page() / 8);`
	`418`	`+ v_scroll->set_value(v_scroll->get_value() + v_scroll->get_page() / ScrollBar::PAGE_DIVISOR);`
`419`	`419`	`}`
`420`	`420`
`421`	`421`	`void ScrollContainer::_accessibility_action_scroll_left(const Variant &p_data) {`
`422`		`- h_scroll->set_value(h_scroll->get_value() - h_scroll->get_page() / 8);`
	`422`	`+ h_scroll->set_value(h_scroll->get_value() - h_scroll->get_page() / ScrollBar::PAGE_DIVISOR);`
`423`	`423`	`}`
`424`	`424`
`425`	`425`	`void ScrollContainer::_accessibility_action_scroll_right(const Variant &p_data) {`
`426`		`- h_scroll->set_value(h_scroll->get_value() + h_scroll->get_page() / 8);`
	`426`	`+ h_scroll->set_value(h_scroll->get_value() + h_scroll->get_page() / ScrollBar::PAGE_DIVISOR);`
`427`	`427`	`}`
`428`	`428`
`429`	`429`	`void ScrollContainer::_notification(int p_what) {`