Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 11 additions & 0 deletions TablePro/AppDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,17 @@ class AppDelegate: NSObject, NSApplicationDelegate {
func applicationDidBecomeActive(_ notification: Notification) {
runPostLaunchActivationIfNeeded()
SyncCoordinator.shared.syncIfNeeded()
ensureAtLeastOneVisibleWindow()
}

private func ensureAtLeastOneVisibleWindow() {
let hasVisibleWindow = NSApp.windows.contains { window in
guard window.isVisible else { return false }
return AppLaunchCoordinator.isMainWindow(window)
|| AppLaunchCoordinator.isWelcomeWindow(window)
}
guard !hasVisibleWindow else { return }
WindowOpener.shared.openWelcome()
}

private func runPostLaunchActivationIfNeeded() {
Expand Down
15 changes: 7 additions & 8 deletions TablePro/Core/Services/Infrastructure/AppLaunchCoordinator.swift
Original file line number Diff line number Diff line change
Expand Up @@ -172,10 +172,7 @@ internal final class AppLaunchCoordinator {
showWelcomeWindow()
return
}
for window in NSApp.windows where Self.isWelcomeWindow(window) {
window.orderOut(nil)
}
Task { [weak self] in
Task {
for connection in valid {
let payload = EditorTabPayload(
connectionId: connection.id, intent: .restoreOrDefault
Expand All @@ -194,11 +191,13 @@ internal final class AppLaunchCoordinator {
}
}
}
for window in NSApp.windows where Self.isWelcomeWindow(window) {
window.close()
let hasVisibleMain = NSApp.windows.contains {
Self.isMainWindow($0) && $0.isVisible
}
if !NSApp.windows.contains(where: { Self.isMainWindow($0) && $0.isVisible }) {
self?.showWelcomeWindow()
if hasVisibleMain {
for window in NSApp.windows where Self.isWelcomeWindow(window) {
window.close()
}
}
}
}
Expand Down
Loading