From 97651fd4acd4e88ee3107d68aaa435dfff4e7aa2 Mon Sep 17 00:00:00 2001 From: Logan Detrick Date: Fri, 4 Apr 2025 18:07:47 -0700 Subject: [PATCH] Consumes Scroll Events and fixes Mouse Warp --- editor/gui/editor_spin_slider.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/editor/gui/editor_spin_slider.cpp b/editor/gui/editor_spin_slider.cpp index e68e3dcc9f4..80391314a5b 100644 --- a/editor/gui/editor_spin_slider.cpp +++ b/editor/gui/editor_spin_slider.cpp @@ -187,9 +187,11 @@ void EditorSpinSlider::_grabber_gui_input(const Ref &p_event) { if (mb->get_button_index() == MouseButton::WHEEL_UP) { set_value(get_value() + get_step()); mousewheel_over_grabber = true; + accept_event(); } else if (mb->get_button_index() == MouseButton::WHEEL_DOWN) { set_value(get_value() - get_step()); mousewheel_over_grabber = true; + accept_event(); } } } @@ -441,7 +443,7 @@ void EditorSpinSlider::_draw_spin_slider() { grabber->set_position((grabber_rect.get_center() - grabber->get_size() * 0.5) * scale); if (mousewheel_over_grabber) { - Input::get_singleton()->warp_mouse(grabber->get_position() + grabber_rect.size); + Input::get_singleton()->warp_mouse(grabber->get_global_position() + grabber_rect.size); } grabber_range = width;