native macOS codings agent orchestrator
6
fork

Configure Feed

Select the types of activity you want to include in your feed.

Fix settings toolbar collapse and worktree shortcut display name (#177)

Restore a stable principal toolbar item in SettingsView to prevent
the toolbar from collapsing when navigating away from the Shortcuts
pane. Also display "Select Worktree 10" instead of "Select Worktree 0"
for the ⌃0 shortcut.

authored by

Stefano Bertagno and committed by
GitHub
21df6fba 901ddf60

+9 -3
+1 -1
supacode/App/AppShortcuts.swift
··· 102 102 case .confirmWorktreeAction: "Confirm Worktree Action" 103 103 case .selectNextWorktree: "Select Next Worktree" 104 104 case .selectPreviousWorktree: "Select Previous Worktree" 105 - case .selectWorktree(let index): "Select Worktree \(index)" 105 + case .selectWorktree(let index): "Select Worktree \(index == 0 ? 10 : index)" 106 106 case .openFinder: "Open Finder" 107 107 case .openRepository: "Open Repository" 108 108 case .openPullRequest: "Open Pull Request"
-1
supacode/Features/Settings/Views/KeyboardShortcutsSettingsView.swift
··· 128 128 } 129 129 } 130 130 } 131 - .toolbarBackgroundVisibility(.hidden, for: .windowToolbar) 132 131 // Align window toolbar and first column text. 133 132 .padding(.leading, -6) 134 133 .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .topLeading)
+7
supacode/Features/Settings/Views/SettingsView.swift
··· 120 120 } 121 121 } 122 122 } 123 + .toolbar { 124 + // Prevent the toolbar from collapsing when switching between 125 + // detail views with and without toolbar items (e.g. Shortcuts). 126 + ToolbarItem(placement: .principal) { 127 + Color.clear.frame(width: 0, height: 0) 128 + } 129 + } 123 130 .navigationSplitViewStyle(.balanced) 124 131 .alert(store: settingsStore.scope(state: \.$alert, action: \.alert)) 125 132 .alert(store: store.scope(state: \.$alert, action: \.alert))
+1 -1
supacodeTests/AppShortcutsTests.swift
··· 86 86 #expect(AppShortcuts.openPullRequest.displayName == "Open Pull Request") 87 87 #expect(AppShortcuts.toggleLeftSidebar.displayName == "Toggle Left Sidebar") 88 88 #expect(AppShortcuts.selectWorktree1.displayName == "Select Worktree 1") 89 - #expect(AppShortcuts.selectWorktree0.displayName == "Select Worktree 0") 89 + #expect(AppShortcuts.selectWorktree0.displayName == "Select Worktree 10") 90 90 } 91 91 92 92 // MARK: - Effective shortcut resolution.