feat(macos): add menu Canvas open/close
This commit is contained in:
@@ -160,6 +160,9 @@ final class AppState {
|
|||||||
didSet { self.ifNotPreview { UserDefaults.standard.set(self.canvasEnabled, forKey: canvasEnabledKey) } }
|
didSet { self.ifNotPreview { UserDefaults.standard.set(self.canvasEnabled, forKey: canvasEnabledKey) } }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Tracks whether the Canvas panel is currently visible (not persisted).
|
||||||
|
var canvasPanelVisible: Bool = false
|
||||||
|
|
||||||
var peekabooBridgeEnabled: Bool {
|
var peekabooBridgeEnabled: Bool {
|
||||||
didSet {
|
didSet {
|
||||||
self.ifNotPreview {
|
self.ifNotPreview {
|
||||||
|
|||||||
@@ -9,6 +9,8 @@ final class CanvasManager {
|
|||||||
private var panelController: CanvasWindowController?
|
private var panelController: CanvasWindowController?
|
||||||
private var panelSessionKey: String?
|
private var panelSessionKey: String?
|
||||||
|
|
||||||
|
var onPanelVisibilityChanged: ((Bool) -> Void)?
|
||||||
|
|
||||||
/// Optional anchor provider (e.g. menu bar status item). If nil, Canvas anchors to the mouse cursor.
|
/// Optional anchor provider (e.g. menu bar status item). If nil, Canvas anchors to the mouse cursor.
|
||||||
var defaultAnchorProvider: (() -> NSRect?)?
|
var defaultAnchorProvider: (() -> NSRect?)?
|
||||||
|
|
||||||
@@ -29,6 +31,9 @@ final class CanvasManager {
|
|||||||
.nonEmpty
|
.nonEmpty
|
||||||
|
|
||||||
if let controller = self.panelController, self.panelSessionKey == session {
|
if let controller = self.panelController, self.panelSessionKey == session {
|
||||||
|
controller.onVisibilityChanged = { [weak self] visible in
|
||||||
|
self?.onPanelVisibilityChanged?(visible)
|
||||||
|
}
|
||||||
controller.presentAnchoredPanel(anchorProvider: anchorProvider)
|
controller.presentAnchoredPanel(anchorProvider: anchorProvider)
|
||||||
controller.applyPreferredPlacement(placement)
|
controller.applyPreferredPlacement(placement)
|
||||||
|
|
||||||
@@ -58,6 +63,9 @@ final class CanvasManager {
|
|||||||
sessionKey: session,
|
sessionKey: session,
|
||||||
root: Self.canvasRoot,
|
root: Self.canvasRoot,
|
||||||
presentation: .panel(anchorProvider: anchorProvider))
|
presentation: .panel(anchorProvider: anchorProvider))
|
||||||
|
controller.onVisibilityChanged = { [weak self] visible in
|
||||||
|
self?.onPanelVisibilityChanged?(visible)
|
||||||
|
}
|
||||||
self.panelController = controller
|
self.panelController = controller
|
||||||
self.panelSessionKey = session
|
self.panelSessionKey = session
|
||||||
controller.applyPreferredPlacement(placement)
|
controller.applyPreferredPlacement(placement)
|
||||||
|
|||||||
@@ -81,6 +81,9 @@ struct ClawdisApp: App {
|
|||||||
self.isPanelVisible = visible
|
self.isPanelVisible = visible
|
||||||
self.updateStatusHighlight()
|
self.updateStatusHighlight()
|
||||||
}
|
}
|
||||||
|
CanvasManager.shared.onPanelVisibilityChanged = { [self] visible in
|
||||||
|
self.state.canvasPanelVisible = visible
|
||||||
|
}
|
||||||
CanvasManager.shared.defaultAnchorProvider = { [self] in self.statusButtonScreenFrame() }
|
CanvasManager.shared.defaultAnchorProvider = { [self] in self.statusButtonScreenFrame() }
|
||||||
|
|
||||||
let handler = StatusItemMouseHandlerView()
|
let handler = StatusItemMouseHandlerView()
|
||||||
|
|||||||
@@ -63,6 +63,15 @@ struct MenuContent: View {
|
|||||||
CanvasManager.shared.hideAll()
|
CanvasManager.shared.hideAll()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if self.state.canvasEnabled {
|
||||||
|
Button(self.state.canvasPanelVisible ? "Close Canvas" : "Open Canvas") {
|
||||||
|
if self.state.canvasPanelVisible {
|
||||||
|
CanvasManager.shared.hideAll()
|
||||||
|
} else {
|
||||||
|
_ = try? CanvasManager.shared.show(sessionKey: "main", path: "/")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
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