fix(mac): reorder menu toggles
This commit is contained in:
@@ -43,14 +43,6 @@ struct MenuContent: View {
|
|||||||
self.statusLine(label: self.heartbeatStatus.label, color: self.heartbeatStatus.color)
|
self.statusLine(label: self.heartbeatStatus.label, color: self.heartbeatStatus.color)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Toggle(isOn: self.voiceWakeBinding) {
|
|
||||||
Label("Voice Wake", systemImage: "mic.fill")
|
|
||||||
}
|
|
||||||
.disabled(!voiceWakeSupported)
|
|
||||||
.opacity(voiceWakeSupported ? 1 : 0.5)
|
|
||||||
if self.showVoiceWakeMicPicker {
|
|
||||||
self.voiceWakeMicMenu
|
|
||||||
}
|
|
||||||
Toggle(
|
Toggle(
|
||||||
isOn: Binding(
|
isOn: Binding(
|
||||||
get: { self.browserControlEnabled },
|
get: { self.browserControlEnabled },
|
||||||
@@ -68,6 +60,14 @@ struct MenuContent: View {
|
|||||||
CanvasManager.shared.hideAll()
|
CanvasManager.shared.hideAll()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Toggle(isOn: self.voiceWakeBinding) {
|
||||||
|
Label("Voice Wake", systemImage: "mic.fill")
|
||||||
|
}
|
||||||
|
.disabled(!voiceWakeSupported)
|
||||||
|
.opacity(voiceWakeSupported ? 1 : 0.5)
|
||||||
|
if self.showVoiceWakeMicPicker {
|
||||||
|
self.voiceWakeMicMenu
|
||||||
|
}
|
||||||
Divider()
|
Divider()
|
||||||
Button {
|
Button {
|
||||||
Task { @MainActor in
|
Task { @MainActor in
|
||||||
@@ -84,19 +84,20 @@ struct MenuContent: View {
|
|||||||
} label: {
|
} label: {
|
||||||
Label("Open Chat", systemImage: "bubble.left.and.bubble.right")
|
Label("Open Chat", systemImage: "bubble.left.and.bubble.right")
|
||||||
}
|
}
|
||||||
Button {
|
if self.state.canvasEnabled {
|
||||||
if self.state.canvasPanelVisible {
|
Button {
|
||||||
CanvasManager.shared.hideAll()
|
if self.state.canvasPanelVisible {
|
||||||
} else {
|
CanvasManager.shared.hideAll()
|
||||||
// Don't force a navigation on re-open: preserve the current web view state.
|
} else {
|
||||||
_ = try? CanvasManager.shared.show(sessionKey: "main", path: nil)
|
// Don't force a navigation on re-open: preserve the current web view state.
|
||||||
|
_ = try? CanvasManager.shared.show(sessionKey: "main", path: nil)
|
||||||
|
}
|
||||||
|
} label: {
|
||||||
|
Label(
|
||||||
|
self.state.canvasPanelVisible ? "Close Canvas" : "Open Canvas",
|
||||||
|
systemImage: "rectangle.inset.filled.on.rectangle")
|
||||||
}
|
}
|
||||||
} label: {
|
|
||||||
Label(
|
|
||||||
self.state.canvasPanelVisible ? "Close Canvas" : "Open Canvas",
|
|
||||||
systemImage: "rectangle.inset.filled.on.rectangle")
|
|
||||||
}
|
}
|
||||||
.disabled(!self.state.canvasEnabled)
|
|
||||||
Divider()
|
Divider()
|
||||||
Button("Settings…") { self.open(tab: .general) }
|
Button("Settings…") { self.open(tab: .general) }
|
||||||
.keyboardShortcut(",", modifiers: [.command])
|
.keyboardShortcut(",", modifiers: [.command])
|
||||||
|
|||||||
Reference in New Issue
Block a user