Browse Source

Merge pull request #105041 from lodetrick/editor-spin-slider-consume-input

Fix EditorSpinSlider Scroll Edit when inside a ScrollContainer
Thaddeus Crews 5 months ago
parent
commit
51201cb549
1 changed files with 3 additions and 1 deletions
  1. 3 1
      editor/gui/editor_spin_slider.cpp

+ 3 - 1
editor/gui/editor_spin_slider.cpp

@@ -187,9 +187,11 @@ void EditorSpinSlider::_grabber_gui_input(const Ref<InputEvent> &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();
 			}
 		}
 	}
@@ -439,7 +441,7 @@ void EditorSpinSlider::_draw_spin_slider() {
 				grabber->set_position(grabber_rect.get_center() - grabber->get_size() * 0.5);
 
 				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;