Merge pull request #78029 from bruvzg/macos_fix_popup_ime_focus

[macOS] Fix IME focus in popup windows.
godotengine · Jun 9, 2023 · a5a2367 · a5a2367
2 parents da68c70 + fe2d9e5
commit a5a2367
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/platform/macos/display_server_macos.mm b/platform/macos/display_server_macos.mm
@@ -2338,7 +2338,7 @@
 	popup_open(p_id);
 	if ([wd.window_object isMiniaturized]) {
 		return;
-	} else if (wd.no_focus || wd.is_popup) {
+	} else if (wd.no_focus) {
 		[wd.window_object orderFront:nil];
 	} else {
 		[wd.window_object makeKeyAndOrderFront:nil];
@@ -2972,7 +2972,7 @@
 			if ([wd.window_object isVisible]) {
 				if ([wd.window_object isMiniaturized]) {
 					return;
-				} else if (wd.no_focus || wd.is_popup) {
+				} else if (wd.no_focus) {
 					[wd.window_object orderFront:nil];
 				} else {
 					[wd.window_object makeKeyAndOrderFront:nil];

diff --git a/platform/macos/godot_content_view.mm b/platform/macos/godot_content_view.mm
@@ -342,7 +342,7 @@ - (BOOL)canBecomeKeyView {
 	}
 
 	DisplayServerMacOS::WindowData &wd = ds->get_window(window_id);
-	return !wd.no_focus && !wd.is_popup;
+	return !wd.no_focus;
 }
 
 - (BOOL)acceptsFirstResponder {

diff --git a/platform/macos/godot_window.mm b/platform/macos/godot_window.mm
@@ -65,7 +65,7 @@ - (BOOL)canBecomeKeyWindow {
 	}
 
 	DisplayServerMacOS::WindowData &wd = ds->get_window(window_id);
-	return !wd.no_focus && !wd.is_popup;
+	return !wd.no_focus;
 }
 
 - (BOOL)canBecomeMainWindow {