Skip to content

fix(preferences): open window over fullscreen apps instead of switchi… #931

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

Open
EthanBlazkowicz wants to merge 2 commits into
base: master
Choose a base branch
from
+10 −6
Open

fix(preferences): open window over fullscreen apps instead of switchi… #931

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e0b453f
fix(preferences): open window over fullscreen apps instead of switchi…
Apr 25, 2026
f9ae4fd
Merge branch 'Caldis:master' into fix/preferences-fullscreen-space
EthanBlazkowicz Apr 30, 2026
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
12 changes: 6 additions & 6 deletions Mos/Managers/WindowManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,24 +37,24 @@ extension WindowManager {
showWindow(withIdentifier: identifier, withTitle: title)
return
}
// 显示
// 取消显示 Dock 图标并激活 App，保留 accessory 模式避免切换 space
// Utils.showDockIcon()
NSApp.activate(ignoringOtherApps: true)

// 显示并前置窗口
windowController.showWindow(self)
// 前置并激活（已打开窗口也要置顶）
if let window = windowController.window {
if window.isMiniaturized {
window.deminiaturize(self)
}
window.makeKeyAndOrderFront(self)
window.orderFrontRegardless()
}
NSApp.activate(ignoringOtherApps: true)
// 显示 Dock 图标
Utils.showDockIcon()
}
// 关闭对应 Identifier 的窗口
func hideWindow(withIdentifier identifier: String, destroy: Bool = false) {
// 隐藏 Dock 图标
Utils.hideDockIcon()
// Utils.hideDockIcon()
// 销毁实例
if destroy {
refs.removeValue(forKey: identifier)
Expand Down
4 changes: 4 additions & 0 deletions Mos/Windows/PreferencesWindow/PreferencesWindowController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@ class PreferencesWindowController: NSWindowController, NSWindowDelegate {

override func windowDidLoad() {
super.windowDidLoad()

// Allow the window to appear on the current active space, including fullscreen apps
window?.collectionBehavior = [.moveToActiveSpace, .fullScreenAuxiliary]

// 插入分隔符
if #available(OSX 10.16, *) {
window?.toolbar?.insertItem(withItemIdentifier: NSToolbarItem.Identifier.flexibleSpace, at: 4)
Expand Down