5 files changed, 33 insertions, 3 deletions
diff --git a/platform/osx/display_server_osx.h b/platform/osx/display_server_osx.h
index eaf03d298e..2b57983ca7 100644
--- a/platform/osx/display_server_osx.h
+++ b/platform/osx/display_server_osx.h
@@ -95,6 +95,7 @@ public:
 		ObjectID instance_id;
 
 		WindowID transient_parent = INVALID_WINDOW_ID;
+		bool exclusive = false;
 		Set<WindowID> transient_children;
 
 		bool layered_window = false;
@@ -274,6 +275,7 @@ public:
 	virtual void window_set_position(const Point2i &p_position, WindowID p_window = MAIN_WINDOW_ID) override;
 
 	virtual void window_set_transient(WindowID p_window, WindowID p_parent) override;
+	virtual void window_set_exclusive(WindowID p_window, bool p_exclusive) override;
 
 	virtual void window_set_max_size(const Size2i p_size, WindowID p_window = MAIN_WINDOW_ID) override;
 	virtual Size2i window_get_max_size(WindowID p_window = MAIN_WINDOW_ID) const override;
diff --git a/platform/osx/display_server_osx.mm b/platform/osx/display_server_osx.mm
index 137b1b45b0..b7258e6cf4 100644
--- a/platform/osx/display_server_osx.mm
+++ b/platform/osx/display_server_osx.mm
@@ -1471,6 +1471,24 @@ void DisplayServerOSX::window_set_current_screen(int p_screen, WindowID p_window
 	}
 }
 
+void DisplayServerOSX::window_set_exclusive(WindowID p_window, bool p_exclusive) {
+	_THREAD_SAFE_METHOD_
+	ERR_FAIL_COND(!windows.has(p_window));
+	WindowData &wd = windows[p_window];
+	if (wd.exclusive != p_exclusive) {
+		wd.exclusive = p_exclusive;
+		if (wd.transient_parent != INVALID_WINDOW_ID) {
+			WindowData &wd_parent = windows[wd.transient_parent];
+			if (wd.exclusive) {
+				ERR_FAIL_COND_MSG([[wd_parent.window_object childWindows] count] > 0, "Transient parent has another exclusive child.");
+				[wd_parent.window_object addChildWindow:wd.window_object ordered:NSWindowAbove];
+			} else {
+				[wd_parent.window_object removeChildWindow:wd.window_object];
+			}
+		}
+	}
+}
+
 Point2i DisplayServerOSX::window_get_position(WindowID p_window) const {
 	_THREAD_SAFE_METHOD_
 
@@ -1541,8 +1559,11 @@ void DisplayServerOSX::window_set_transient(WindowID p_window, WindowID p_parent
 
 		wd_window.transient_parent = INVALID_WINDOW_ID;
 		wd_parent.transient_children.erase(p_window);
-
 		[wd_window.window_object setCollectionBehavior:NSWindowCollectionBehaviorFullScreenPrimary];
+
+		if (wd_window.exclusive) {
+			[wd_parent.window_object removeChildWindow:wd_window.window_object];
+		}
 	} else {
 		ERR_FAIL_COND(!windows.has(p_parent));
 		ERR_FAIL_COND_MSG(wd_window.transient_parent != INVALID_WINDOW_ID, "Window already has a transient parent");
@@ -1550,8 +1571,11 @@ void DisplayServerOSX::window_set_transient(WindowID p_window, WindowID p_parent
 
 		wd_window.transient_parent = p_parent;
 		wd_parent.transient_children.insert(p_window);
-
 		[wd_window.window_object setCollectionBehavior:NSWindowCollectionBehaviorFullScreenAuxiliary];
+
+		if (wd_window.exclusive) {
+			[wd_parent.window_object addChildWindow:wd_window.window_object ordered:NSWindowAbove];
+		}
 	}
 }
 
diff --git a/platform/osx/export/export_plugin.cpp b/platform/osx/export/export_plugin.cpp
index f0b58efb63..4d5c0a827a 100644
--- a/platform/osx/export/export_plugin.cpp
+++ b/platform/osx/export/export_plugin.cpp
@@ -31,6 +31,7 @@
 #include "modules/modules_enabled.gen.h" // For regex.
 
 #include "codesign.h"
+#include "editor/editor_node.h"
 #include "export_plugin.h"
 
 void EditorExportPlatformOSX::get_preset_features(const Ref<EditorExportPreset> &p_preset, List<String> *r_features) {
diff --git a/platform/osx/export/export_plugin.h b/platform/osx/export/export_plugin.h
index 931ce7e41a..b85e9d662c 100644
--- a/platform/osx/export/export_plugin.h
+++ b/platform/osx/export/export_plugin.h
@@ -40,7 +40,6 @@
 #include "core/os/os.h"
 #include "core/version.h"
 #include "editor/editor_export.h"
-#include "editor/editor_node.h"
 #include "editor/editor_settings.h"
 #include "platform/osx/logo.gen.h"
 
diff --git a/platform/osx/godot_content_view.mm b/platform/osx/godot_content_view.mm
index 4e831e1ccc..76d9cfb081 100644
--- a/platform/osx/godot_content_view.mm
+++ b/platform/osx/godot_content_view.mm
@@ -117,6 +117,10 @@
 	}
 }
 
+- (void)doCommandBySelector:(SEL)aSelector {
+	[self tryToPerform:aSelector with:self];
+}
+
 - (void)unmarkText {
 	ime_input_event_in_progress = false;
 	[[marked_text mutableString] setString:@""];