fix: settings window display issue

tisfeng · Feb 16, 2024 · 51b5792 · 51b5792
1 parent 1c228a8
commit 51b5792
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/Easydict/Feature/ViewController/Window/WindowManager/EZWindowManager.m b/Easydict/Feature/ViewController/Window/WindowManager/EZWindowManager.m
@@ -413,6 +413,14 @@ - (void)showFloatingWindow:(EZBaseQueryWindow *)window atPoint:(CGPoint)point {
         [preferencesWindowController.window close];
     }
 
+    // Workaround for SwiftUI Settings window
+    // https://github.com/tisfeng/Easydict/issues/362
+    for (NSWindow *window in [NSApp windows]) {
+        if ([window.identifier isEqualToString:@"com_apple_SwiftUI_Settings_window"]) {
+            [window close];
+        }
+    }
+
     // get safe window position
     CGPoint safeLocation = [EZCoordinateUtils getFrameSafePoint:window.frame moveToPoint:point inScreen:self.screen];
     [window setFrameOrigin:safeLocation];
@@ -904,11 +912,6 @@ - (void)closeFloatingWindow {
     self.floatingWindow.titleBar.pin = NO;
     [self.floatingWindow close];
 
-    if (![EZPreferencesWindowController.shared isShowing]) {
-        // recover last app.
-        [self activeLastFrontmostApplication];
-    }
-
     if ([EZMainQueryWindow isAlive]) {
         [self.mainWindow orderBack:nil];
     }