noahbackus/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Merge pull request #88992 from Sauermann/fix-window-mouse-notification

Browse Source 
Fix mouse entered notifications
This commit is contained in:
Rémi Verschelde
2024-02-29 13:55:12 +01:00
parent b0b9c66a7f d259f979f5
commit 99ba2519ea
2 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
scene/main/viewport.cpp
View File

@@ -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()));

2
scene/main/viewport.h
View File

@@ -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;