Mac Quick Send:全局热键 + 菜单栏(Phase 4c)
- MacQuickSend(@Observable 单例):激活 app + NSOpenPanel 多选文件 → 置 pending;MacRootView 观察 pending → 切到「传输」区 + 弹 MacComposeSheet 选目标设备发送(复用现有发送流程与 engine.sendFile) - MacHotkey:Carbon RegisterEventHotKey 全局热键 ⌃⌥⌘S(无须辅助功能权限)触发 Quick Send。事件处理器须 C 函数指针,用不捕获闭包(只调静态 MacQuickSend.trigger)+ dispatch 主队列再弹模态(避免 Carbon 回调内跑模态)。登录(MacRootView onAppear)注册、登出(onDisappear)注销 - 菜单栏加「快速发送文件…」(登录态) - 桌面 Wails 实际未实现全局热键(仅曾计划),此为原生 Mac 增益。键位暂固定 ⌃⌥⌘S,后续可做成设置项 - 验证:just mac-build(CommilitiaDropMac.app)BUILD SUCCEEDED;iOS 无关(仅改 macOS-only 文件),不受影响
This commit is contained in:
@@ -11,6 +11,7 @@ struct MacRootView: View
|
||||
@Environment(EngineController.self) private var engine
|
||||
@Environment(AuthManager.self) private var auth
|
||||
@AppStorage("macClipboardAutoSync") private var autoSync = true
|
||||
@State private var quickSend = MacQuickSend.shared
|
||||
@State private var selection: MacSection = .transfers
|
||||
|
||||
var body: some View
|
||||
@@ -57,9 +58,27 @@ struct MacRootView: View
|
||||
NoticeOverlay()
|
||||
}
|
||||
// 剪贴板自动同步(上行):登录进壳即按开关启停;开关变化即时生效;登出(本视图消失)停。
|
||||
.onAppear { syncClipboardMonitor() }
|
||||
// 同时注册 / 注销 Quick Send 全局热键(⌃⌥⌘S)。
|
||||
.onAppear { syncClipboardMonitor(); MacHotkey.shared.register() }
|
||||
.onChange(of: autoSync) { syncClipboardMonitor() }
|
||||
.onDisappear { MacClipboardMonitor.shared.stop() }
|
||||
.onDisappear { MacClipboardMonitor.shared.stop(); MacHotkey.shared.unregister() }
|
||||
// Quick Send(热键 / 菜单栏触发):有待发文件即切到「传输」并弹发送表单。
|
||||
.onChange(of: quickSend.pending)
|
||||
{ _, urls in
|
||||
if !urls.isEmpty { selection = .transfers }
|
||||
}
|
||||
.sheet(isPresented: Binding(get: { !quickSend.pending.isEmpty },
|
||||
set: { if !$0 { quickSend.pending = [] } }))
|
||||
{
|
||||
MacComposeSheet(urls: quickSend.pending,
|
||||
onCancel: { quickSend.pending = [] },
|
||||
onSend:
|
||||
{ device in
|
||||
for url in quickSend.pending { engine.sendFile(to: device, fileURL: url) }
|
||||
quickSend.pending = []
|
||||
})
|
||||
.environment(engine)
|
||||
}
|
||||
}
|
||||
|
||||
private func syncClipboardMonitor()
|
||||
|
||||
Reference in New Issue
Block a user