diff --git a/doc/classes/Slider.xml b/doc/classes/Slider.xml index 0471b8c275f..492b6164bf3 100644 --- a/doc/classes/Slider.xml +++ b/doc/classes/Slider.xml @@ -33,7 +33,7 @@ - Emitted when dragging is started. + Emitted when dragging is started. This is emitted before the corresponding [signal Range.value_changed] signal. diff --git a/scene/gui/slider.cpp b/scene/gui/slider.cpp index 586334a0b44..69d281e3731 100644 --- a/scene/gui/slider.cpp +++ b/scene/gui/slider.cpp @@ -64,6 +64,8 @@ void Slider::gui_input(const Ref &p_event) { } grab.pos = orientation == VERTICAL ? mb->get_position().y : mb->get_position().x; + grab.value_before_dragging = get_as_ratio(); + emit_signal(SNAME("drag_started")); double grab_width = (double)grabber->get_width(); double grab_height = (double)grabber->get_height(); @@ -78,12 +80,11 @@ void Slider::gui_input(const Ref &p_event) { grab.active = true; grab.uvalue = get_as_ratio(); - emit_signal(SNAME("drag_started")); _notify_shared_value_changed(); } else { grab.active = false; - const bool value_changed = !Math::is_equal_approx((double)grab.uvalue, get_as_ratio()); + const bool value_changed = !Math::is_equal_approx((double)grab.value_before_dragging, get_as_ratio()); emit_signal(SNAME("drag_ended"), value_changed); } } else if (scrollable) { diff --git a/scene/gui/slider.h b/scene/gui/slider.h index 05766fa7426..07c1d23e32f 100644 --- a/scene/gui/slider.h +++ b/scene/gui/slider.h @@ -38,7 +38,8 @@ class Slider : public Range { struct Grab { int pos = 0; - double uvalue = 0.0; + double uvalue = 0.0; // Value at `pos`. + double value_before_dragging = 0.0; bool active = false; } grab;