Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bugfix: settings window display issue #410

Merged
merged 2 commits into from
Feb 18, 2024
Merged

bugfix: settings window display issue #410

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
51b5792
fix: settings window display issue
phlpsong Feb 16, 2024
792769e
perf: activate last frontmost app when closing query window if settin…
tisfeng Feb 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 18 additions & 5 deletions Easydict/Feature/ViewController/Window/WindowManager/EZWindowManager.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,10 +408,7 @@ - (void)showFloatingWindow:(EZBaseQueryWindow *)window atPoint:(CGPoint)point {
return;
}

EZPreferencesWindowController *preferencesWindowController = [EZPreferencesWindowController shared];
if (preferencesWindowController.isShowing) {
[preferencesWindowController.window close];
}
[[self currentShowingSettingsWindow] close];

// get safe window position
CGPoint safeLocation = [EZCoordinateUtils getFrameSafePoint:window.frame moveToPoint:point inScreen:self.screen];
Expand All @@ -437,6 +434,22 @@ - (void)showFloatingWindow:(EZBaseQueryWindow *)window atPoint:(CGPoint)point {
[self updateFloatingWindowType:window.windowType];
}

- (nullable NSWindow *)currentShowingSettingsWindow {
EZPreferencesWindowController *preferencesWindowController = [EZPreferencesWindowController shared];
if (preferencesWindowController.isShowing) {
return preferencesWindowController.window;
}

// Workaround for SwiftUI Settings window, fix https://github.com/tisfeng/Easydict/issues/362
for (NSWindow *window in [NSApp windows]) {
if ([window.identifier isEqualToString:@"com_apple_SwiftUI_Settings_window"] && window.visible) {
return window;
}
}

return nil;
}

- (void)updateFloatingWindowType:(EZWindowType)floatingWindowType {
NSNumber *windowType = @(floatingWindowType);
[self.floatingWindowTypeArray removeObject:windowType];
Expand Down Expand Up @@ -904,7 +917,7 @@ - (void)closeFloatingWindow {
self.floatingWindow.titleBar.pin = NO;
[self.floatingWindow close];

if (![EZPreferencesWindowController.shared isShowing]) {
if (![self currentShowingSettingsWindow]) {
// recover last app.
[self activeLastFrontmostApplication];
}
Expand Down