瀏覽代碼

Merge pull request #78110 from Sauermann/fix-nofocus-focus

Fix Tooltip getting removed instantly in embedded Window
Rémi Verschelde 2 年之前
父節點
當前提交
9fca498647
共有 1 個文件被更改,包括 5 次插入1 次删除
  1. 5 1
      scene/main/viewport.cpp

+ 5 - 1
scene/main/viewport.cpp

@@ -285,7 +285,11 @@ void Viewport::_sub_window_register(Window *p_window) {
 	gui.sub_windows.push_back(sw);
 
 	if (gui.subwindow_drag == SUB_WINDOW_DRAG_DISABLED) {
-		_sub_window_grab_focus(p_window);
+		if (p_window->get_flag(Window::FLAG_NO_FOCUS)) {
+			_sub_window_update_order();
+		} else {
+			_sub_window_grab_focus(p_window);
+		}
 	} else {
 		int index = _sub_window_find(gui.currently_dragged_subwindow);
 		sw = gui.sub_windows[index];