mirror of
https://github.com/shadowsocks/ShadowsocksX-NG.git
synced 2026-11-12 01:55:06 +00:00
Qiu Yuzhou
c708cd8d19
The home run-control card and the menu-bar status card render the agent and system-proxy status rows straight from snapshot replacements, so fast operations (e.g. proxy mode switches) flash transient states like "applying" before settling. Add a presentation-layer debounce shared by both surfaces: - TransientDelayGate: per-stream gate where stable values display immediately, transient values (starting/applying/repairing) display after 400 ms and are dropped when superseded, and displayed transients are held for at least 400 ms. - StatusDisplayModel: app-level shared model deriving agent and system-proxy payloads (row + detail + hint) from workflow snapshots through two independent gates; domain facts keep their cadence. - Wire the model through the composition root into RuntimeControlCard and StatusCardView; toggles, approval actions, the difference view and target/mode rows keep reading the raw snapshot.
50 lines
1.7 KiB
Swift
50 lines
1.7 KiB
Swift
import AppKit
|
|
import SwiftUI
|
|
|
|
/// 菜单栏窗口式面板：重开主窗口、只读状态卡、无效服务器提示与退出。
|
|
/// 控制与目标选择留在工作区；状态卡的状态行走 statusDisplay 的瞬态门控
|
|
/// 呈现（与首页运行控制卡同一 debounce 口径）。
|
|
struct ProxyStatusMenu: View {
|
|
@ObservedObject var control: ProxyControlWorkflow
|
|
let statusDisplay: StatusDisplayModel
|
|
@Environment(\.openWindow) private var openWindow
|
|
/// 只捕获本面板的宿主窗口，打开主窗口时不会误关其他窗口。
|
|
@State private var windowAnchor = NSView(frame: .zero)
|
|
|
|
var body: some View {
|
|
VStack(alignment: .leading, spacing: 0) {
|
|
Button("打开主窗口…") {
|
|
windowAnchor.window?.orderOut(nil)
|
|
NSApp.activate(ignoringOtherApps: true)
|
|
openWindow(id: WorkspaceRoute.workspaceSceneID)
|
|
}
|
|
.padding(12)
|
|
|
|
Button("诊断…") {
|
|
windowAnchor.window?.orderOut(nil)
|
|
NSApp.activate(ignoringOtherApps: true)
|
|
openWindow(id: DiagnosticsWindowState.sceneID)
|
|
}
|
|
.padding(12)
|
|
|
|
Divider()
|
|
StatusCardView(control: control, statusDisplay: statusDisplay)
|
|
Divider()
|
|
Button("退出 ShadowsocksX-NG2（代理仍在后台运行）") {
|
|
NSApp.terminate(nil)
|
|
}
|
|
.padding(12)
|
|
}
|
|
.frame(width: 320, alignment: .leading)
|
|
.background(StatusPanelWindowAnchor(view: windowAnchor).frame(width: 0, height: 0))
|
|
}
|
|
}
|
|
|
|
/// MenuBarExtra 没有关闭弹出面板的绑定；零尺寸视图定位当前面板的窗口。
|
|
private struct StatusPanelWindowAnchor: NSViewRepresentable {
|
|
let view: NSView
|
|
|
|
func makeNSView(context: Context) -> NSView { view }
|
|
func updateNSView(_ nsView: NSView, context: Context) {}
|
|
}
|