diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-05-24 15:51:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-24 15:51:03 +0200 |
| commit | f279837f3e5ec1315da9cd201e21dbf5958e9708 (patch) | |
| tree | c7f74608cc031a76a56bf767ebd009440e8b56f1 | |
| parent | d1b4b62eb576e2374af1446850d7ac54662fea58 (diff) | |
| parent | 2d84ec5468ea0f88b2df5e5f8ae257f72288aa9d (diff) | |
Merge pull request #29067 from KoBeWi/spin_edit
Pass mouse events to SpinBox from its LineEdit
| -rw-r--r-- | scene/gui/line_edit.cpp | 1 | ||||
| -rw-r--r-- | scene/gui/spin_box.cpp | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/scene/gui/line_edit.cpp b/scene/gui/line_edit.cpp index ed74851755..fa1a63f5e2 100644 --- a/scene/gui/line_edit.cpp +++ b/scene/gui/line_edit.cpp @@ -68,6 +68,7 @@ void LineEdit::_gui_input(Ref<InputEvent> p_event) { _reset_caret_blink_timer(); if (b->is_pressed()) { + accept_event(); //don't pass event further when clicked on text field if (!text.empty() && is_editable() && _is_over_clear_button(b->get_position())) { clear_button_status.press_attempt = true; clear_button_status.pressing_inside = true; diff --git a/scene/gui/spin_box.cpp b/scene/gui/spin_box.cpp index d21143739c..e778af3ceb 100644 --- a/scene/gui/spin_box.cpp +++ b/scene/gui/spin_box.cpp @@ -277,6 +277,7 @@ SpinBox::SpinBox() { add_child(line_edit); line_edit->set_anchors_and_margins_preset(Control::PRESET_WIDE); + line_edit->set_mouse_filter(MOUSE_FILTER_PASS); //connect("value_changed",this,"_value_changed"); line_edit->connect("text_entered", this, "_text_entered", Vector<Variant>(), CONNECT_DEFERRED); line_edit->connect("focus_exited", this, "_line_edit_focus_exit", Vector<Variant>(), CONNECT_DEFERRED); |