浏览代码

properly send mouse released event when grabbing modal focus, fixes #14854

Juan Linietsky 7 年之前
父节点
当前提交
feef500b39
共有 1 个文件被更改,包括 11 次插入1 次删除
  1. 11 1
      scene/main/viewport.cpp

+ 11 - 1
scene/main/viewport.cpp

@@ -2371,7 +2371,17 @@ List<Control *>::Element *Viewport::_gui_show_modal(Control *p_control) {
 		p_control->_modal_set_prev_focus_owner(0);
 
 	if (gui.mouse_focus && !p_control->is_a_parent_of(gui.mouse_focus)) {
-		gui.mouse_focus->notification(Control::NOTIFICATION_MOUSE_EXIT);
+		Ref<InputEventMouseButton> mb;
+		mb.instance();
+		mb->set_position(gui.mouse_focus->get_local_mouse_position());
+		mb->set_global_position(gui.mouse_focus->get_local_mouse_position());
+		mb->set_button_index(gui.mouse_focus_button);
+		mb->set_pressed(false);
+		gui.mouse_focus->call_multilevel(SceneStringNames::get_singleton()->_gui_input, mb);
+
+		//if (gui.mouse_over == gui.mouse_focus) {
+		//	gui.mouse_focus->notification(Control::NOTIFICATION_MOUSE_EXIT);
+		//}
 		gui.mouse_focus = NULL;
 	}