diff options
| author | Markus Sauermann <6299227+Sauermann@users.noreply.github.com> | 2022-03-26 17:01:19 +0100 |
|---|---|---|
| committer | Markus Sauermann <6299227+Sauermann@users.noreply.github.com> | 2022-03-27 14:20:03 +0200 |
| commit | d8a3d4b9da4f2a98befc793ff53b859aa8e6c19e (patch) | |
| tree | eeb3c43581b067c4d5e7e1330343ff0ca552f2f5 /scene | |
| parent | a5eed70fa2edcf755d6abea2077232e38381449b (diff) | |
Send Mouse Enter/Exit Notifications independently of mouse focus
Diffstat (limited to 'scene')
| -rw-r--r-- | scene/main/viewport.cpp | 31 |
1 files changed, 5 insertions, 26 deletions
diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp index 4525696071..7d2032f530 100644 --- a/scene/main/viewport.cpp +++ b/scene/main/viewport.cpp @@ -1603,29 +1603,6 @@ void Viewport::_gui_input_event(Ref<InputEvent> p_event) { _gui_call_input(mouse_focus, mb); } - // In case the mouse was released after for example dragging a scrollbar, - // check whether the current control is different from the stored one. If - // it is different, rather than wait for it to be updated the next time the - // mouse is moved, notify the control so that it can e.g. drop the highlight. - // This code is duplicated from the mm.is_valid()-case further below. - Control *over = nullptr; - if (gui.mouse_focus) { - over = gui.mouse_focus; - } else { - over = gui_find_control(mpos); - } - - if (gui.mouse_focus_mask == MouseButton::NONE && over != gui.mouse_over) { - _drop_mouse_over(); - _gui_cancel_tooltip(); - - if (over) { - _gui_call_notification(over, Control::NOTIFICATION_MOUSE_ENTER); - } - } - - gui.mouse_over = over; - set_input_as_handled(); } } @@ -1685,9 +1662,7 @@ void Viewport::_gui_input_event(Ref<InputEvent> p_event) { } Control *over = nullptr; - if (gui.mouse_focus) { - over = gui.mouse_focus; - } else if (gui.mouse_in_viewport) { + if (gui.mouse_in_viewport) { over = gui_find_control(mpos); } @@ -1701,6 +1676,10 @@ void Viewport::_gui_input_event(Ref<InputEvent> p_event) { } } + if (gui.mouse_focus) { + over = gui.mouse_focus; + } + DisplayServer::CursorShape ds_cursor_shape = (DisplayServer::CursorShape)Input::get_singleton()->get_default_cursor_shape(); if (over) { |