Skip to content
Merged
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
29 changes: 28 additions & 1 deletion MarkEditMac/Sources/Main/AppDocumentController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,35 @@ final class AppDocumentController: NSDocumentController {
openPanel.showsHiddenFiles = AppPreferences.General.showHiddenFiles
openPanel.relayoutAccessoryView()

let onBecomeActive = NotificationCenter.default.addObserver(
forName: NSApplication.didBecomeActiveNotification,
object: NSApp,
queue: .main
) { [weak self] _ in
Task { @MainActor in
self?.appearanceDidChange(isAppActive: true)
}
}

let onResignActive = NotificationCenter.default.addObserver(
forName: NSApplication.didResignActiveNotification,
object: NSApp,
queue: .main
) { [weak self] _ in
Task { @MainActor in
self?.appearanceDidChange(isAppActive: false)
}
}

let appearanceObservation = NSApp.observe(\.effectiveAppearance) { [weak self] _, _ in
Task { @MainActor in
self?.appearanceDidChange()
}
}

defer {
NotificationCenter.default.removeObserver(onBecomeActive)
NotificationCenter.default.removeObserver(onResignActive)
appearanceObservation.invalidate()
UserDefaults.forcedColorScheme = .system
}
Expand Down Expand Up @@ -99,7 +121,12 @@ final class AppDocumentController: NSDocumentController {
// MARK: - Private

private extension AppDocumentController {
func appearanceDidChange() {
func appearanceDidChange(isAppActive: Bool = NSApp.isActive) {
guard isAppActive else {
UserDefaults.forcedColorScheme = .system
return
}

switch AppPreferences.General.appearance {
case .system:
UserDefaults.forcedColorScheme = .system
Expand Down