diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-01-27 10:25:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-27 10:25:12 +0100 |
| commit | 549ffb9be9521a9092ddd4ec87eac1f9b735f45c (patch) | |
| tree | 2d9d40abfdf4aaaf6fefbc44a883e2948edf2e26 /scene/gui | |
| parent | 2ebbf62be6c2a298418b0a08714d3850f8cf3dce (diff) | |
| parent | ae2cf8eb382db2b6c8d597f0015db976eb433500 (diff) | |
Merge pull request #45040 from volkathemartian/fix-spinbox-mouse-capture
Fix unintended SpinBox mouse capture
Diffstat (limited to 'scene/gui')
| -rw-r--r-- | scene/gui/spin_box.cpp | 1 | ||||
| -rw-r--r-- | scene/gui/spin_box.h | 8 |
2 files changed, 4 insertions, 5 deletions
diff --git a/scene/gui/spin_box.cpp b/scene/gui/spin_box.cpp index 037a60810e..32c878205e 100644 --- a/scene/gui/spin_box.cpp +++ b/scene/gui/spin_box.cpp @@ -280,7 +280,6 @@ SpinBox::SpinBox() { line_edit->connect("text_entered", callable_mp(this, &SpinBox::_text_entered), Vector<Variant>(), CONNECT_DEFERRED); line_edit->connect("focus_exited", callable_mp(this, &SpinBox::_line_edit_focus_exit), Vector<Variant>(), CONNECT_DEFERRED); line_edit->connect("gui_input", callable_mp(this, &SpinBox::_line_edit_input)); - drag.enabled = false; range_click_timer = memnew(Timer); range_click_timer->connect("timeout", callable_mp(this, &SpinBox::_range_click_timeout)); diff --git a/scene/gui/spin_box.h b/scene/gui/spin_box.h index 0647ec005b..a4e3d644e2 100644 --- a/scene/gui/spin_box.h +++ b/scene/gui/spin_box.h @@ -52,11 +52,11 @@ class SpinBox : public Range { void _line_edit_input(const Ref<InputEvent> &p_event); struct Drag { - float base_val; - bool allowed; - bool enabled; + float base_val = 0; + bool allowed = false; + bool enabled = false; Vector2 capture_pos; - float diff_y; + float diff_y = 0; } drag; void _line_edit_focus_exit(); |