Andrew/redot-engine
1
0
Fork 0
mirror of https://github.com/Redot-Engine/redot-engine.git synced 2025-12-06 15:21:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix NOTIFICATION_WM_CLOSE_REQUEST in Embedded Floating Window

Browse Source
This commit is contained in:
Hilderin
2025-01-21 19:12:27 -05:00
parent a7146ef807
commit 9eed43d429
6 changed files with 53 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
editor/window_wrapper.cpp
View File

@@ -101,12 +101,6 @@ void WindowWrapper::_set_window_enabled_with_rect(bool p_visible, const Rect2 p_
Node *parent = _get_wrapped_control_parent();
// In the GameView plugin, we need to the the signal before the window is actually closed
// to prevent the embedded game to be seen the parent window for a fraction of a second.
if (!p_visible) {
emit_signal("window_before_closing");
}
if (wrapped_control->get_parent() != parent) {
// Move the control to the window.
wrapped_control->reparent(parent, false);
@@ -120,7 +114,7 @@ void WindowWrapper::_set_window_enabled_with_rect(bool p_visible, const Rect2 p_
}
window->set_visible(p_visible);
if (!p_visible) {
if (!p_visible && !override_close_request) {
emit_signal("window_close_requested");
}
emit_signal("window_visibility_changed", p_visible);
@@ -141,10 +135,17 @@ void WindowWrapper::_window_size_changed() {
emit_signal(SNAME("window_size_changed"));
}
void WindowWrapper::_window_close_request() {
if (override_close_request) {
emit_signal("window_close_requested");
} else {
set_window_enabled(false);
}
}
void WindowWrapper::_bind_methods() {
ADD_SIGNAL(MethodInfo("window_visibility_changed", PropertyInfo(Variant::BOOL, "visible")));
ADD_SIGNAL(MethodInfo("window_close_requested"));
ADD_SIGNAL(MethodInfo("window_before_closing"));
ADD_SIGNAL(MethodInfo("window_size_changed"));
}
@@ -330,6 +331,10 @@ void WindowWrapper::grab_window_focus() {
}
}
void WindowWrapper::set_override_close_request(bool p_enabled) {
override_close_request = p_enabled;
}
WindowWrapper::WindowWrapper() {
if (!EditorNode::get_singleton()->is_multi_window_enabled()) {
return;
@@ -342,7 +347,7 @@ WindowWrapper::WindowWrapper() {
add_child(window);
window->hide();
window->connect("close_requested", callable_mp(this, &WindowWrapper::set_window_enabled).bind(false));
window->connect("close_requested", callable_mp(this, &WindowWrapper::_window_close_request));
window->connect("size_changed", callable_mp(this, &WindowWrapper::_window_size_changed));
ShortcutBin *capturer = memnew(ShortcutBin);