Skip to content

fix(macos): resolve two build errors on main #9329

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
noanflaherty merged 1 commit into from
Feb 26, 2026
Merged

fix(macos): resolve two build errors on main #9329

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions clients/macos/vellum-assistant-app/VellumAssistantApp.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,19 +35,19 @@ struct VellumAssistantApp: App {
appDelegate.handleConversationZoomIn()
}
.keyboardShortcut("+", modifiers: .command)
.disabled(!(appDelegate.mainWindow?.windowState.isConversationVisible ?? false))
.disabled(!appDelegate.isConversationZoomEnabled)

Button("Conversation Zoom Out") {
appDelegate.handleConversationZoomOut()
}
.keyboardShortcut("-", modifiers: .command)
.disabled(!(appDelegate.mainWindow?.windowState.isConversationVisible ?? false))
.disabled(!appDelegate.isConversationZoomEnabled)

Button("Conversation Actual Size") {
appDelegate.handleConversationZoomReset()
}
.keyboardShortcut("0", modifiers: .command)
.disabled(!(appDelegate.mainWindow?.windowState.isConversationVisible ?? false))
.disabled(!appDelegate.isConversationZoomEnabled)

Divider()

Expand Down
5 changes: 5 additions & 0 deletions clients/macos/vellum-assistant/App/AppDelegate+MenuBar.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,11 @@ extension AppDelegate {
}
}

/// Whether conversation zoom commands should be enabled (public for the SwiftUI command group).
public var isConversationZoomEnabled: Bool {
mainWindow?.windowState.isConversationVisible ?? false
}

@objc public func handleConversationZoomIn() { routeZoomIntent(.conversationZoomIn) }
@objc public func handleConversationZoomOut() { routeZoomIntent(.conversationZoomOut) }
@objc public func handleConversationZoomReset() { routeZoomIntent(.conversationZoomReset) }
Expand Down
2 changes: 1 addition & 1 deletion clients/macos/vellum-assistant/Features/Settings/SettingsConnectTab.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1862,7 +1862,7 @@ struct SettingsConnectTab: View {
.font(.system(size: 11, weight: .medium))
.foregroundColor(spinning ? VColor.accent : VColor.textMuted)
.rotationEffect(.degrees(spinning ? 360 : 0))
.animation(spinning ? .linear(duration: 1).repeatForever(autoreverses: false) : .identity, value: spinning)
.animation(spinning ? .linear(duration: 1).repeatForever(autoreverses: false) : .default, value: spinning)
Comment thread
noanflaherty marked this conversation as resolved.
.frame(width: 24, height: 24)
.contentShape(Rectangle())
}
Expand Down