diff options
| author | kit <kitbdev@gmail.com> | 2023-10-31 13:55:34 -0400 |
|---|---|---|
| committer | kit <kitbdev@gmail.com> | 2023-11-09 09:11:59 -0500 |
| commit | d24d73ba3140b540a017bb230e57d9cde0c3d806 (patch) | |
| tree | 5bf2b7f8fcb9ea5b6df7ab8f8641987920ad93ef /scene/gui | |
| parent | 4c96e9676b66d0cc9a25022b019b78f4c20ddc60 (diff) | |
| download | redot-engine-d24d73ba3140b540a017bb230e57d9cde0c3d806.tar.gz | |
Make mouse-enter/exit notifications match mouse event propagation
`NOTIFICATION_MOUSE_ENTER` and `NOTIFICATION_MOUSE_EXIT` now includes
the areas of children control nodes if the mouse filters allow it.
In order to check if a Control node itself was entered/exited, the newly
introduced `NOTIFICATION_MOUSE_ENTER_SELF` and
`NOTIFICATION_MOUSE_EXIT_SELF` can be used.
Co-authored-by: Markus Sauermann <6299227+Sauermann@users.noreply.github.com>
Diffstat (limited to 'scene/gui')
| -rw-r--r-- | scene/gui/control.cpp | 11 | ||||
| -rw-r--r-- | scene/gui/control.h | 2 |
2 files changed, 13 insertions, 0 deletions
diff --git a/scene/gui/control.cpp b/scene/gui/control.cpp index c7ff5980cb..87539ef8f2 100644 --- a/scene/gui/control.cpp +++ b/scene/gui/control.cpp @@ -1831,9 +1831,18 @@ bool Control::has_point(const Point2 &p_point) const { void Control::set_mouse_filter(MouseFilter p_filter) { ERR_MAIN_THREAD_GUARD; ERR_FAIL_INDEX(p_filter, 3); + + if (data.mouse_filter == p_filter) { + return; + } + data.mouse_filter = p_filter; notify_property_list_changed(); update_configuration_warnings(); + + if (get_viewport()) { + get_viewport()->_gui_update_mouse_over(); + } } Control::MouseFilter Control::get_mouse_filter() const { @@ -3568,6 +3577,8 @@ void Control::_bind_methods() { BIND_CONSTANT(NOTIFICATION_RESIZED); BIND_CONSTANT(NOTIFICATION_MOUSE_ENTER); BIND_CONSTANT(NOTIFICATION_MOUSE_EXIT); + BIND_CONSTANT(NOTIFICATION_MOUSE_ENTER_SELF); + BIND_CONSTANT(NOTIFICATION_MOUSE_EXIT_SELF); BIND_CONSTANT(NOTIFICATION_FOCUS_ENTER); BIND_CONSTANT(NOTIFICATION_FOCUS_EXIT); BIND_CONSTANT(NOTIFICATION_THEME_CHANGED); diff --git a/scene/gui/control.h b/scene/gui/control.h index abbdc42fa4..db1bd3a346 100644 --- a/scene/gui/control.h +++ b/scene/gui/control.h @@ -368,6 +368,8 @@ public: NOTIFICATION_SCROLL_BEGIN = 47, NOTIFICATION_SCROLL_END = 48, NOTIFICATION_LAYOUT_DIRECTION_CHANGED = 49, + NOTIFICATION_MOUSE_ENTER_SELF = 60, + NOTIFICATION_MOUSE_EXIT_SELF = 61, }; // Editor plugin interoperability. |