Skip to content

Fix settings pane scrolling #70

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
Peyton-Spencer merged 2 commits into from
Jun 18, 2026
Merged

Fix settings pane scrolling #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f33c25
fix: make settings tabs scrollable
Peyton-Spencer Jun 18, 2026
bcc1ac1
fix: align settings window initial height
Peyton-Spencer Jun 18, 2026
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
2 changes: 1 addition & 1 deletion Sources/MacRunner/MacRunnerApp.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
let window = NSWindow(contentViewController: hostingController)
window.title = "Mac Runner Settings"
window.styleMask = [.titled, .closable]
window.setContentSize(NSSize(width: 400, height: 300))
window.setContentSize(NSSize(width: 400, height: 420))
window.center()
window.isReleasedWhenClosed = false
window.makeKeyAndOrderFront(nil)
Expand Down
323 changes: 167 additions & 156 deletions Sources/Views/MenuBarView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,207 +414,218 @@ struct SettingsView: View {
var body: some View {
TabView {
// General Tab
VStack(alignment: .leading, spacing: 16) {
Text("General")
.font(.headline)

Toggle("Launch at Login", isOn: Binding(
get: { runnerManager.currentSettings.startOnLogin },
set: { newValue in
var settings = runnerManager.currentSettings
settings.startOnLogin = newValue
runnerManager.updateSettings(settings)
}
))

Text("When enabled, Mac Runner starts automatically when you log in and restarts any runners that were previously running.")
.font(.caption)
.foregroundColor(.secondary)

Toggle("Check for Updates Automatically", isOn: Binding(
get: { runnerManager.currentSettings.autoCheckForUpdates },
set: { newValue in
var settings = runnerManager.currentSettings
settings.autoCheckForUpdates = newValue
runnerManager.updateSettings(settings)
}
))

Text("Checks the latest GitHub release on launch, then uses a 24-hour backoff with a 5-minute response cache for manual refreshes.")
.font(.caption)
.foregroundColor(.secondary)

Toggle("Auto-Restart on Crash", isOn: Binding(
get: { runnerManager.currentSettings.autoRestartEnabled },
set: { newValue in
var settings = runnerManager.currentSettings
settings.autoRestartEnabled = newValue
runnerManager.updateSettings(settings)
}
))

HStack {
Text("Max retries in 10 minutes")
Spacer()
Stepper(
value: Binding(
get: { runnerManager.currentSettings.autoRestartMaxRetries },
set: { newValue in
var settings = runnerManager.currentSettings
settings.autoRestartMaxRetries = max(1, newValue)
runnerManager.updateSettings(settings)
}
),
in: 1...20
) {
Text("\(runnerManager.currentSettings.autoRestartMaxRetries)")
.monospacedDigit()
}
.labelsHidden()
}

Text("Crash recovery uses exponential backoff (5s, 10s, 20s, capped at 60s).")
.font(.caption)
.foregroundColor(.secondary)

Toggle("Job Notifications", isOn: Binding(
get: { runnerManager.currentSettings.notificationsEnabled },
set: { newValue in
var settings = runnerManager.currentSettings
settings.notificationsEnabled = newValue
runnerManager.updateSettings(settings)
}
))
ScrollView {
VStack(alignment: .leading, spacing: 16) {
Text("General")
.font(.headline)

Text("Show native macOS notifications when a runner starts a job and when that job completes. Clicking a notification opens the GitHub Actions run.")
.font(.caption)
.foregroundColor(.secondary)
Toggle("Launch at Login", isOn: Binding(
get: { runnerManager.currentSettings.startOnLogin },
set: { newValue in
var settings = runnerManager.currentSettings
settings.startOnLogin = newValue
runnerManager.updateSettings(settings)
}
))

VStack(alignment: .leading, spacing: 6) {
Text("Default Open Files Limit")
.font(.subheadline)
Text("When enabled, Mac Runner starts automatically when you log in and restarts any runners that were previously running.")
.font(.caption)
.foregroundColor(.secondary)

TextField("Open files limit", value: Binding(
get: { runnerManager.currentSettings.openFileLimit },
Toggle("Check for Updates Automatically", isOn: Binding(
get: { runnerManager.currentSettings.autoCheckForUpdates },
set: { newValue in
var settings = runnerManager.currentSettings
settings.openFileLimit = max(1, newValue)
settings.autoCheckForUpdates = newValue
runnerManager.updateSettings(settings)
}
), formatter: openFileLimitFormatter)
.textFieldStyle(.roundedBorder)
))

Text("Applied to runners by default across non-isolated, dedicated-user, and container modes unless a runner overrides it.")
Text("Checks the latest GitHub release on launch, then uses a 24-hour backoff with a 5-minute response cache for manual refreshes.")
.font(.caption)
.foregroundColor(.secondary)
}

VStack(alignment: .leading, spacing: 6) {
Text("Extra CI Tools")
.font(.subheadline)
Toggle("Auto-Restart on Crash", isOn: Binding(
get: { runnerManager.currentSettings.autoRestartEnabled },
set: { newValue in
var settings = runnerManager.currentSettings
settings.autoRestartEnabled = newValue
runnerManager.updateSettings(settings)
}
))

HStack {
Text("Max retries in 10 minutes")
Spacer()
Stepper(
value: Binding(
get: { runnerManager.currentSettings.autoRestartMaxRetries },
set: { newValue in
var settings = runnerManager.currentSettings
settings.autoRestartMaxRetries = max(1, newValue)
runnerManager.updateSettings(settings)
}
),
in: 1...20
) {
Text("\(runnerManager.currentSettings.autoRestartMaxRetries)")
.monospacedDigit()
}
.labelsHidden()
}

Text("Crash recovery uses exponential backoff (5s, 10s, 20s, capped at 60s).")
.font(.caption)
.foregroundColor(.secondary)

TextField("jq, pnpm, ...", text: Binding(
get: { runnerManager.currentSettings.tools.extraPackages.joined(separator: ", ") },
Toggle("Job Notifications", isOn: Binding(
get: { runnerManager.currentSettings.notificationsEnabled },
set: { newValue in
var settings = runnerManager.currentSettings
settings.tools = ToolProvisioningSettings(
extraPackages: newValue
.components(separatedBy: ",")
.map {
$0.trimmingCharacters(in: .whitespacesAndNewlines)
}
)
settings.notificationsEnabled = newValue
runnerManager.updateSettings(settings)
}
))
.textFieldStyle(.roundedBorder)

Text("New runners always provision gh, detect common language toolchains from repo metadata, and install any extra Homebrew packages listed here.")
Text("Show native macOS notifications when a runner starts a job and when that job completes. Clicking a notification opens the GitHub Actions run.")
.font(.caption)
.foregroundColor(.secondary)

VStack(alignment: .leading, spacing: 6) {
Text("Default Open Files Limit")
.font(.subheadline)
.foregroundColor(.secondary)

TextField("Open files limit", value: Binding(
get: { runnerManager.currentSettings.openFileLimit },
set: { newValue in
var settings = runnerManager.currentSettings
settings.openFileLimit = max(1, newValue)
runnerManager.updateSettings(settings)
}
), formatter: openFileLimitFormatter)
.textFieldStyle(.roundedBorder)

Text("Applied to runners by default across non-isolated, dedicated-user, and container modes unless a runner overrides it.")
.font(.caption)
.foregroundColor(.secondary)
}

VStack(alignment: .leading, spacing: 6) {
Text("Extra CI Tools")
.font(.subheadline)
.foregroundColor(.secondary)

TextField("jq, pnpm, ...", text: Binding(
get: { runnerManager.currentSettings.tools.extraPackages.joined(separator: ", ") },
set: { newValue in
var settings = runnerManager.currentSettings
settings.tools = ToolProvisioningSettings(
extraPackages: newValue
.components(separatedBy: ",")
.map {
$0.trimmingCharacters(in: .whitespacesAndNewlines)
}
)
runnerManager.updateSettings(settings)
}
))
.textFieldStyle(.roundedBorder)

Text("New runners always provision gh, detect common language toolchains from repo metadata, and install any extra Homebrew packages listed here.")
.font(.caption)
.foregroundColor(.secondary)
}
}
Spacer()
.padding()
.frame(maxWidth: .infinity, alignment: .leading)
}
.padding()
.tabItem { Label("General", systemImage: "gear") }

// GitHub Tab
VStack(alignment: .leading, spacing: 16) {
Text("GitHub Authentication")
.font(.headline)
ScrollView {
VStack(alignment: .leading, spacing: 16) {
Text("GitHub Authentication")
.font(.headline)

HStack {
Circle()
.fill(isAuthenticated ? Color.green : Color.red)
.frame(width: 10, height: 10)
Text(isAuthenticated ? "Authenticated" : "Not authenticated")
}
HStack {
Circle()
.fill(isAuthenticated ? Color.green : Color.red)
.frame(width: 10, height: 10)
Text(isAuthenticated ? "Authenticated" : "Not authenticated")
}

Text(authStatusText)
.font(.caption)
.foregroundColor(.secondary)
.textSelection(.enabled)
Text(authStatusText)
.font(.caption)
.foregroundColor(.secondary)
.textSelection(.enabled)

if !isAuthenticated {
Button(action: {
Task { await login() }
}) {
Label("Sign in with GitHub", systemImage: "person.badge.key")
if !isAuthenticated {
Button(action: {
Task { await login() }
}) {
Label("Sign in with GitHub", systemImage: "person.badge.key")
}
.disabled(isLoggingIn)
}
.disabled(isLoggingIn)
}

Spacer()
.padding()
.frame(maxWidth: .infinity, alignment: .leading)
}
.padding()
.tabItem { Label("GitHub", systemImage: "lock.shield") }

// About Tab
VStack(spacing: 12) {
Image(systemName: "figure.run")
.font(.system(size: 48))
.foregroundColor(.accentColor)
GeometryReader { proxy in
ScrollView {
VStack(spacing: 12) {
Spacer(minLength: 0)

Text("Mac Runner")
.font(.title2)
.bold()
Image(systemName: "figure.run")
.font(.system(size: 48))
.foregroundColor(.accentColor)

Text("Version \(CLIHandler.version)")
.foregroundColor(.secondary)
Text("Mac Runner")
.font(.title2)
.bold()

if let update = runnerManager.availableUpdate {
Text("Update available: \(update.latestVersion)")
.font(.caption)
.foregroundColor(.accentColor)
} else {
Text(runnerManager.updateStatusMessage)
.font(.caption)
.foregroundColor(.secondary)
.multilineTextAlignment(.center)
}
Text("Version \(CLIHandler.version)")
.foregroundColor(.secondary)

Button(action: {
Task {
await runnerManager.checkForUpdates(force: true)
}
}) {
Label("Check for Updates", systemImage: "arrow.clockwise")
}
.disabled(runnerManager.isCheckingForUpdates)
if let update = runnerManager.availableUpdate {
Text("Update available: \(update.latestVersion)")
.font(.caption)
.foregroundColor(.accentColor)
} else {
Text(runnerManager.updateStatusMessage)
.font(.caption)
.foregroundColor(.secondary)
.multilineTextAlignment(.center)
}

Text("GitHub Actions self-hosted runner manager for macOS")
.font(.caption)
.foregroundColor(.secondary)
.multilineTextAlignment(.center)
Button(action: {
Task {
await runnerManager.checkForUpdates(force: true)
}
}) {
Label("Check for Updates", systemImage: "arrow.clockwise")
}
.disabled(runnerManager.isCheckingForUpdates)

Spacer()
Text("GitHub Actions self-hosted runner manager for macOS")
.font(.caption)
.foregroundColor(.secondary)
.multilineTextAlignment(.center)

Spacer(minLength: 0)
}
.padding()
.frame(maxWidth: .infinity)
.frame(minHeight: proxy.size.height)
}
}
.padding()
.tabItem { Label("About", systemImage: "info.circle") }
}
.frame(minWidth: 400, minHeight: 300)
.frame(minWidth: 400, minHeight: 420)
Comment thread
coderabbitai[bot] marked this conversation as resolved.
.task {
await checkAuth()
}
Expand Down
Loading