From cb67d8b2fa9b9c9d30cd81d72b8737ee2baa44b6 Mon Sep 17 00:00:00 2001
From: Ariver <shanghai3168@gmail.com>
Date: Fri, 19 Jun 2026 14:09:49 +0800
Subject: [PATCH] Fix vertical keyboard window focus
---
C1.source/Sources/Aligner/AlignerApplicationDelegate.swift | 29 +++++++++++++++++++++++++----
1 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/C1.source/Sources/Aligner/AlignerApplicationDelegate.swift b/C1.source/Sources/Aligner/AlignerApplicationDelegate.swift
index 455f099..4ada6fd 100644
--- a/C1.source/Sources/Aligner/AlignerApplicationDelegate.swift
+++ b/C1.source/Sources/Aligner/AlignerApplicationDelegate.swift
@@ -494,8 +494,8 @@
controller.onSnapshotUpdated = { [weak self] in
self?.writeQuickSwitchReportIfNeeded()
}
- controller.onOpenSettings = { [weak self] in
- self?.showSettingsFromQuickSwitch()
+ controller.onToggleWaterfallViewMode = { [weak self] in
+ self?.toggleQuickSwitchWaterfallViewModeFromQuickSwitch()
}
quickSwitchSessionController = controller
}
@@ -573,8 +573,8 @@
controller.onSnapshotUpdated = { [weak self] in
self?.writeQuickSwitchReportIfNeeded()
}
- controller.onOpenSettings = { [weak self] in
- self?.showSettingsFromQuickSwitch()
+ controller.onToggleWaterfallViewMode = { [weak self] in
+ self?.toggleQuickSwitchWaterfallViewModeFromQuickSwitch()
}
quickSwitchSessionController = controller
}
@@ -662,6 +662,14 @@
return FixtureQuickSwitchSnapshotLoader(appCount: 1, mode: .spaceFilter)
}
+ if round1QuickSwitchOptions.fixtureSplitView {
+ return FixtureQuickSwitchSnapshotLoader(appCount: 1, mode: .splitView)
+ }
+
+ if round1QuickSwitchOptions.fixtureMultiPageIdentity {
+ return FixtureQuickSwitchSnapshotLoader(appCount: 1, mode: .multiPageIdentity)
+ }
+
if let fixtureAppCount = round1QuickSwitchOptions.fixtureAppCount {
return FixtureQuickSwitchSnapshotLoader(
appCount: fixtureAppCount,
@@ -741,6 +749,19 @@
])
}
+ private func toggleQuickSwitchWaterfallViewModeFromQuickSwitch() {
+ let currentMode = quickSwitchWaterfallViewMode()
+ let nextMode: QuickSwitchWaterfallViewMode = currentMode == .horizontalMasonry
+ ? .verticalColumns
+ : .horizontalMasonry
+ DevelopmentDiagnostics.log("app.quickSwitch.waterfallViewModeToggle", [
+ "currentMode": currentMode.rawValue,
+ "nextMode": nextMode.rawValue,
+ "quickSwitchVisible": quickSwitchSessionController?.isVisible ?? false
+ ])
+ setQuickSwitchWaterfallViewMode(nextMode)
+ }
+
private func appVersionBuild() -> (version: String, build: String) {
let info = Bundle.main.infoDictionary ?? [:]
let version = info["CFBundleShortVersionString"] as? String ?? "Unknown"
--
Gitblit v1.9.3