diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2024-02-29 13:55:12 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2024-02-29 13:55:12 +0100 |
| commit | 99ba2519eaf79271c86b8a932ce185666fb79a37 (patch) | |
| tree | a01794755a417dc44f75a92036e7b51594bae799 | |
| parent | b0b9c66a7fa1a664918c1cddf97d3652ab2837fc (diff) | |
| parent | d259f979f513d8b4730ff8b40f976b8ae8973dd2 (diff) | |
| download | redot-engine-99ba2519eaf79271c86b8a932ce185666fb79a37.tar.gz | |
Merge pull request #88992 from Sauermann/fix-window-mouse-notification
Fix mouse entered notifications
| -rw-r--r-- | scene/main/viewport.cpp | 3 | ||||
| -rw-r--r-- | scene/main/viewport.h | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp index f596114d99..1ee6a8dca7 100644 --- a/scene/main/viewport.cpp +++ b/scene/main/viewport.cpp @@ -3158,9 +3158,6 @@ void Viewport::_update_mouse_over(Vector2 p_pos) { gui.subwindow_over->_mouse_leave_viewport(); } gui.subwindow_over = sw; - if (!sw->is_input_disabled()) { - sw->_propagate_window_notification(sw, NOTIFICATION_WM_MOUSE_ENTER); - } } if (!sw->is_input_disabled()) { sw->_update_mouse_over(sw->get_final_transform().affine_inverse().xform(p_pos - sw->get_position())); diff --git a/scene/main/viewport.h b/scene/main/viewport.h index 03db0d4023..2904e3e156 100644 --- a/scene/main/viewport.h +++ b/scene/main/viewport.h @@ -352,7 +352,7 @@ private: struct GUI { bool forced_mouse_focus = false; //used for menu buttons - bool mouse_in_viewport = true; + bool mouse_in_viewport = false; bool key_event_accepted = false; HashMap<int, ObjectID> touch_focus; Control *mouse_focus = nullptr; |