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

Merge pull request #86377 from timothyqiu/slider-drag 

Emit slider's `drag_started` signal before the first value change
This commit is contained in:
Yuri Sizov 2023-12-22 17:20:05 +01:00
parent 84d4889fa0 58db3e5d7b
commit b4fe310f7d
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/classes/Slider.xml
View File

@ -33,7 +33,7 @@
</signal>
<signal name="drag_started">
<description>
Emitted when dragging is started.
Emitted when dragging is started. This is emitted before the corresponding [signal Range.value_changed] signal.
</description>
</signal>
</signals>

5
scene/gui/slider.cpp
View File

@ -64,6 +64,8 @@ void Slider::gui_input(const Ref<InputEvent> &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<InputEvent> &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) {

3
scene/gui/slider.h
View File

@ -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;