Skip to content

fix: preserve layout identity and apply portals across display changes #8

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

Merged
ai-eks merged 5 commits into from
Sep 9, 2026
Merged

fix: preserve layout identity and apply portals across display changes #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5b9057e
docs: refine portal layout fix plan after review
JaeHyeon-KAIST Sep 8, 2026
bd2a89c
fix: preserve matched layout identity after pruning
JaeHyeon-KAIST Sep 8, 2026
2aa123e
fix: apply saved portals across display configuration changes
JaeHyeon-KAIST Sep 8, 2026
44de494
build: add local app packaging without Developer ID credentials
JaeHyeon-KAIST Sep 8, 2026
6acdf12
docs: record resource baseline and long-term follow-up plan
JaeHyeon-KAIST Sep 8, 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
22 changes: 22 additions & 0 deletions MousePortal/AppDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,14 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
private let windowLayoutService = WindowLayoutService.shared
private var hotkeyConfigStore = HotkeyConfigStore.shared
private var cancellables: Set<AnyCancellable> = []
private lazy var displayCoordinator = DisplayConfigurationCoordinator(
provider: SystemDisplayProvider(),
layouts: .shared,
portals: .shared,
displayService: .shared,
preservedSignatures: { Set(WindowLayoutService.shared.snapshots.map(\.displayLayoutSignature)) },
updateHotkeys: { HotkeyConfigStore.shared.initializeDefaults(from: $0) }
)

// 应用状态
@AppStorage("showMenuBarIcon") private var showMenuBarIcon = true
Expand Down Expand Up @@ -82,6 +90,17 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
return false
}

func applicationWillTerminate(_ notification: Notification) {
displayCoordinator.stop()
hotkeyService?.stop()
portalService?.stop()
windowLayoutService.stopMonitoring()
}

func refreshDisplayConfiguration() {
displayCoordinator.refresh()
}

// MARK: - Menu Bar Setup

private func setupMenuBarItem() {
Expand Down Expand Up @@ -169,6 +188,8 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
private func setupServices() {
hotkeyService = HotkeyService.shared
portalService = PortalService.shared
// Resolve the active layout before accepting any input events.
displayCoordinator.start()

if hotkeyConfigStore.globalEnabled {
hotkeyService?.start()
Expand Down Expand Up @@ -274,6 +295,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
}

@objc private func quitApp() {
displayCoordinator.stop()
hotkeyService?.stop()
portalService?.stop()
windowLayoutService.stopMonitoring()
Expand Down
32 changes: 7 additions & 25 deletions MousePortal/ContentView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ struct ContentView: View {
.buttonStyle(.bordered)
}

Button(action: { displayService.fetchDisplays() }) {
Button(action: { AppDelegate.shared?.refreshDisplayConfiguration() }) {
Image(systemName: "arrow.clockwise")
}
.help(L("button.refresh"))
Expand Down Expand Up @@ -393,35 +393,17 @@ struct ContentView: View {
.background(HomeSurface.background)
.frame(minWidth: 1000, minHeight: 680)
.onAppear {
displayService.fetchDisplays()
// 只在首次加载时设置 selectedLayoutID
AppDelegate.shared?.refreshDisplayConfiguration()
if selectedLayoutID == nil {
let layout = layoutService.matchOrCreateLayout(
for: displayService.displays,
preserving: savedWindowLayoutSignatures
)
selectedLayoutID = layout.id
hotkeyConfigStore.initializeDefaults(from: layout.displaysApplyingCustomNames(to: displayService.displays))
} else {
// 确保 currentLayoutID 正确更新
let layout = layoutService.matchOrCreateLayout(
for: displayService.displays,
preserving: savedWindowLayoutSignatures
)
hotkeyConfigStore.initializeDefaults(from: layout.displaysApplyingCustomNames(to: displayService.displays))
selectedLayoutID = layoutService.currentLayoutID
}
checkPermissionOnLaunch()
synchronizeWindowSnapshotSelection()
}
.onReceive(NotificationCenter.default.publisher(for: NSApplication.didChangeScreenParametersNotification)) { _ in
displayService.fetchDisplays()
hotkeyConfigStore.initializeDefaults(from: displayService.displays)
// 使用稳定性检测，避免唤醒时产生大量中间状态的排列
layoutService.handleDisplayChange(
displays: displayService.displays,
preserving: savedWindowLayoutSignatures
) { layout in
hotkeyConfigStore.initializeDefaults(from: layout.displaysApplyingCustomNames(to: displayService.displays))
.onReceive(layoutService.$currentLayoutID.receive(on: RunLoop.main)) { currentID in
// Preserve explicit browsing of saved layouts, unless that layout was pruned.
if selectedLayoutID == nil || !layoutService.layouts.contains(where: { $0.id == selectedLayoutID }) {
selectedLayoutID = currentID
}
}
.onReceive(NotificationCenter.default.publisher(for: .languageDidChange)) { _ in
Expand Down
155 changes: 53 additions & 102 deletions MousePortal/Models/DisplayLayout.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,54 +291,44 @@ class DisplayLayoutService: ObservableObject {

private let storageKey = "displayLayouts"
private let currentLayoutKey = "currentLayoutID"

// MARK: - 稳定性检测

/// 稳定性检测所需的连续匹配次数
private let requiredStableCount = 3

/// 稳定性检测的时间间隔（秒）
private let stabilityCheckInterval: TimeInterval = 0.5

/// 当前检测到的显示器签名
private var pendingSignature: String?

/// 连续检测到相同签名的次数
private var stableCount = 0

/// 稳定性检测定时器
private var stabilityTimer: Timer?

/// 待处理的显示器列表
private var pendingDisplays: [DisplayInfo] = []

private init() {
private let defaults: UserDefaults
private let applyPortals: @MainActor ([PortalPair]) -> Void

init(
defaults: UserDefaults = .standard,
applyPortals: @escaping @MainActor ([PortalPair]) -> Void = { portals in
PortalService.shared.portals = portals
PortalService.shared.save()
}
) {
self.defaults = defaults
self.applyPortals = applyPortals
load()
}

// MARK: - 存储

func load() {
if let data = UserDefaults.standard.data(forKey: storageKey),
if let data = defaults.data(forKey: storageKey),
let layouts = try? JSONDecoder().decode([DisplayLayout].self, from: data) {
self.layouts = layouts
}

if let idString = UserDefaults.standard.string(forKey: currentLayoutKey),
if let idString = defaults.string(forKey: currentLayoutKey),
let id = UUID(uuidString: idString) {
currentLayoutID = id
}
}

func save() {
if let data = try? JSONEncoder().encode(layouts) {
UserDefaults.standard.set(data, forKey: storageKey)
defaults.set(data, forKey: storageKey)
}

if let id = currentLayoutID {
UserDefaults.standard.set(id.uuidString, forKey: currentLayoutKey)
defaults.set(id.uuidString, forKey: currentLayoutKey)
} else {
UserDefaults.standard.removeObject(forKey: currentLayoutKey)
defaults.removeObject(forKey: currentLayoutKey)
}
}

Expand Down Expand Up @@ -393,75 +383,18 @@ class DisplayLayoutService: ObservableObject {
return sorted.map { "\($0.width)x\($0.height)@\($0.x),\($0.y)\($0.isMain ? "M" : "")" }.joined(separator: "|")
}

/// 处理显示器变化（带稳定性检测）
/// - Parameter displays: 当前检测到的显示器列表
/// - Parameter completion: 当排列稳定后的回调，返回匹配或创建的 Layout
func handleDisplayChange(
displays: [DisplayInfo],
preserving displayLayoutSignatures: Set<String> = [],
completion: ((DisplayLayout) -> Void)? = nil
) {
let newSignature = generateSignature(for: displays)

// 如果签名与上次相同，增加稳定计数
if newSignature == pendingSignature {
stableCount += 1
} else {
// 签名变化，重置计数
pendingSignature = newSignature
pendingDisplays = displays
stableCount = 1
}

// 取消之前的定时器
stabilityTimer?.invalidate()

// 检查是否达到稳定阈值
if stableCount >= requiredStableCount {
// 已稳定，执行匹配或创建
let layout = matchOrCreateLayout(
for: displays,
preserving: displayLayoutSignatures
)
resetStabilityState()
completion?(layout)
} else {
// 未稳定，设置定时器继续检测
stabilityTimer = Timer.scheduledTimer(withTimeInterval: stabilityCheckInterval, repeats: false) { [weak self] _ in
guard let self = self else { return }
// 超时后，如果有待处理的显示器，强制处理
if !self.pendingDisplays.isEmpty {
let layout = self.matchOrCreateLayout(
for: self.pendingDisplays,
preserving: displayLayoutSignatures
)
self.resetStabilityState()
completion?(layout)
}
}
}
}

/// 重置稳定性检测状态
private func resetStabilityState() {
pendingSignature = nil
stableCount = 0
pendingDisplays = []
stabilityTimer?.invalidate()
stabilityTimer = nil
}

/// 根据当前显示器自动匹配或创建配置（内部方法，不带稳定性检测）
func matchOrCreateLayout(
for displays: [DisplayInfo],
preserving displayLayoutSignatures: Set<String> = []
) -> DisplayLayout {
// 尝试匹配现有配置
if let matchedIndex = layouts.firstIndex(where: { $0.matches(displays: displays) }) {
currentLayoutID = layouts[matchedIndex].id
if let matchedLayout = layouts.first(where: { $0.matches(displays: displays) }) {
migrateLegacyPortalLines(in: matchedLayout.id)
currentLayoutID = matchedLayout.id
pruneLayouts(preserving: displayLayoutSignatures)
save()
return layouts[matchedIndex]
return layouts.first(where: { $0.id == matchedLayout.id }) ?? matchedLayout
}

// 创建新配置
Expand All @@ -478,6 +411,30 @@ class DisplayLayoutService: ObservableObject {
return layouts.first(where: { $0.id == layout.id }) ?? layout
}

/// Saved display IDs identify the original geometry even after macOS assigns new IDs.
private func migrateLegacyPortalLines(in layoutID: UUID) {
guard let index = layouts.firstIndex(where: { $0.id == layoutID }) else { return }
let snapshots = layouts[index].displaySnapshots
func migrate(_ line: PortalLine) -> PortalLine {
guard line.displayLayoutKey == nil,
let legacyID = line.legacyDisplayID,
let snapshot = snapshots.first(where: { $0.displayID == legacyID }) else { return line }
var migrated = line
migrated.displayLayoutKey = snapshot.layoutKey
migrated.legacyDisplayID = nil
return migrated
}
let migrated = layouts[index].portals.map { portal in
var portal = portal
portal.lineA = migrate(portal.lineA)
portal.lineB = migrate(portal.lineB)
return portal
}
if migrated != layouts[index].portals {
layouts[index].portals = migrated
}
}

/// 生成排列名称
private func generateLayoutName(for displays: [DisplayInfo]) -> String {
DisplayLayout.defaultLayoutName(displayCount: displays.count)
Expand Down Expand Up @@ -579,10 +536,16 @@ class DisplayLayoutService: ObservableObject {
/// 删除传送门
@MainActor
func removePortal(id portalID: UUID) {
removePortals(ids: [portalID])
}

/// Resolve list selections to IDs before mutating the array.
@MainActor
func removePortals(ids portalIDs: Set<UUID>) {
guard let layoutID = currentLayoutID,
let layoutIndex = layouts.firstIndex(where: { $0.id == layoutID }) else { return }

layouts[layoutIndex].portals.removeAll { $0.id == portalID }
layouts[layoutIndex].portals.removeAll { portalIDs.contains($0.id) }
layouts[layoutIndex].modifiedAt = Date()
save()

Expand Down Expand Up @@ -611,18 +574,6 @@ class DisplayLayoutService: ObservableObject {
/// 同步当前排列的传送门到 PortalService
@MainActor
func syncToPortalService() {
PortalService.shared.portals = currentPortals
PortalService.shared.save()
}

/// 从 PortalService 同步传送门到当前排列
@MainActor
func syncFromPortalService() {
guard let id = currentLayoutID,
let index = layouts.firstIndex(where: { $0.id == id }) else { return }

layouts[index].portals = PortalService.shared.portals
layouts[index].modifiedAt = Date()
save()
applyPortals(currentPortals)
}
}
Loading
Loading