Browse Source

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

Fix mouse entered notifications
Rémi Verschelde 1 year ago
parent
commit
99ba2519ea
2 changed files with 1 additions and 4 deletions
  1. 0 3
      scene/main/viewport.cpp
  2. 1 1
      scene/main/viewport.h

+ 0 - 3
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->_mouse_leave_viewport();
 						}
 						}
 						gui.subwindow_over = sw;
 						gui.subwindow_over = sw;
-						if (!sw->is_input_disabled()) {
-							sw->_propagate_window_notification(sw, NOTIFICATION_WM_MOUSE_ENTER);
-						}
 					}
 					}
 					if (!sw->is_input_disabled()) {
 					if (!sw->is_input_disabled()) {
 						sw->_update_mouse_over(sw->get_final_transform().affine_inverse().xform(p_pos - sw->get_position()));
 						sw->_update_mouse_over(sw->get_final_transform().affine_inverse().xform(p_pos - sw->get_position()));

+ 1 - 1
scene/main/viewport.h

@@ -352,7 +352,7 @@ private:
 
 
 	struct GUI {
 	struct GUI {
 		bool forced_mouse_focus = false; //used for menu buttons
 		bool forced_mouse_focus = false; //used for menu buttons
-		bool mouse_in_viewport = true;
+		bool mouse_in_viewport = false;
 		bool key_event_accepted = false;
 		bool key_event_accepted = false;
 		HashMap<int, ObjectID> touch_focus;
 		HashMap<int, ObjectID> touch_focus;
 		Control *mouse_focus = nullptr;
 		Control *mouse_focus = nullptr;