Skip to content

Size settings window to content and make tabs scrollable #131

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
austin-smith merged 3 commits into from
Aug 12, 2026
Merged

Size settings window to content and make tabs scrollable #131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c9fde9e
size settings window to content and scroll long tabs
tomholford Aug 7, 2026
f4d1f93
bump settings window min height and drop windowResizability
tomholford Aug 9, 2026
8155ea3
Merge branch 'main' into size-settings-window-to-content
austin-smith Aug 12, 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 BitDream/BitDreamApp.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ private extension BitDreamApp {
SettingsView(store: store)
#endif
}
.frame(minWidth: 500, idealWidth: 550, maxWidth: 650)
.frame(minWidth: 500, idealWidth: 550, maxWidth: 650, minHeight: 650)
.environmentObject(themeManager) // Pass the ThemeManager to the Settings view
.immediateTheme(manager: themeManager)
}
Expand Down
252 changes: 127 additions & 125 deletions BitDream/Views/macOS/Settings/macOSGeneralSettingsTab.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,173 +41,175 @@ struct macOSGeneralSettingsTab: View {
#endif

var body: some View {
VStack(alignment: .leading, spacing: 20) {
GroupBox {
VStack(alignment: .leading, spacing: 16) {
settingsSection("Appearance") {
HStack {
Text("Theme")
Spacer()
Picker("", selection: $themeManager.themeMode) {
ForEach(ThemeMode.allCases, id: \.self) { mode in
Text(mode.rawValue).tag(mode)
ScrollView {
VStack(alignment: .leading, spacing: 20) {
GroupBox {
VStack(alignment: .leading, spacing: 16) {
settingsSection("Appearance") {
HStack {
Text("Theme")
Spacer()
Picker("", selection: $themeManager.themeMode) {
ForEach(ThemeMode.allCases, id: \.self) { mode in
Text(mode.rawValue).tag(mode)
}
}
.pickerStyle(.menu)
}

HStack {
Text("Accent Color")
Spacer()
Picker("", selection: $themeManager.currentAccentColorOption) {
ForEach(AccentColorOption.allCases) { option in
HStack {
Circle()
.fill(option.color)
.frame(width: 12, height: 12)
Text(option.name)
}
.tag(option)
}
}
.pickerStyle(.menu)
}
.pickerStyle(.menu)
}

HStack {
Text("Accent Color")
Spacer()
Picker("", selection: $themeManager.currentAccentColorOption) {
HStack(spacing: 12) {
ForEach(AccentColorOption.allCases) { option in
HStack {
Circle()
VStack {
RoundedRectangle(cornerRadius: 8)
.fill(option.color)
.frame(width: 12, height: 12)
Text(option.name)
.frame(width: 40, height: 40)
.overlay(
RoundedRectangle(cornerRadius: 8)
.stroke(themeManager.currentAccentColorOption == option ? Color.primary : Color.clear, lineWidth: 2)
)
Text(option.rawValue)
.font(.caption2)
.foregroundColor(.secondary)
}
.onTapGesture {
themeManager.setAccentColor(option)
}
.tag(option)
}
}
.pickerStyle(.menu)
.padding(.top, 8)

Toggle("Show file type icons", isOn: $showContentTypeIcons)
}

HStack(spacing: 12) {
ForEach(AccentColorOption.allCases) { option in
VStack {
RoundedRectangle(cornerRadius: 8)
.fill(option.color)
.frame(width: 40, height: 40)
.overlay(
RoundedRectangle(cornerRadius: 8)
.stroke(themeManager.currentAccentColorOption == option ? Color.primary : Color.clear, lineWidth: 2)
)
Text(option.rawValue)
.font(.caption2)
.foregroundColor(.secondary)
}
.onTapGesture {
themeManager.setAccentColor(option)
divider

settingsSection("Menu Bar") {
Toggle("Show BitDream in menu bar", isOn: $menuBarTransferWidgetEnabled)

VStack(alignment: .leading, spacing: 12) {
Toggle("Show active torrent count", isOn: $menuBarShowActiveCount)

HStack {
Text("Sort torrents by")
Spacer()
Picker("", selection: menuBarSortMode) {
ForEach(MenuBarSortMode.allCases, id: \.self) { mode in
Text(mode.label).tag(mode)
}
}
.pickerStyle(.menu)
}
}
.padding(.leading, 20)
.disabled(!menuBarTransferWidgetEnabled)
}
.padding(.top, 8)

Toggle("Show file type icons", isOn: $showContentTypeIcons)
}
divider

divider
settingsSection("Dock Badge") {
Toggle("Show completed torrents count", isOn: $dockShowCompletedBadge)
Toggle("Show download rate", isOn: $dockShowDownloadSpeed)
Toggle("Show upload rate", isOn: $dockShowUploadSpeed)
}

settingsSection("Menu Bar") {
Toggle("Show BitDream in menu bar", isOn: $menuBarTransferWidgetEnabled)
divider

VStack(alignment: .leading, spacing: 12) {
Toggle("Show active torrent count", isOn: $menuBarShowActiveCount)
settingsSection("Connection Settings") {
HStack {
Text("Startup connection")
Spacer()
Picker("", selection: .fromRawValue(rawValue: $startupBehaviorRaw, defaultValue: AppDefaults.startupConnectionBehavior)) {
Text("Last used server").tag(StartupConnectionBehavior.lastUsed)
Text("Default server").tag(StartupConnectionBehavior.defaultServer)
}
.pickerStyle(.menu)
}
.help("Choose which server BitDream connects to when it launches.")

HStack {
Text("Sort torrents by")
Text("Auto-refresh interval")
Spacer()
Picker("", selection: menuBarSortMode) {
ForEach(MenuBarSortMode.allCases, id: \.self) { mode in
Text(mode.label).tag(mode)
Picker("", selection: $store.pollInterval) {
ForEach(SettingsView.pollIntervalOptions, id: \.self) { interval in
Text(SettingsView.formatInterval(interval)).tag(interval)
}
}
.pickerStyle(.menu)
}
}
.padding(.leading, 20)
.disabled(!menuBarTransferWidgetEnabled)
}

divider
#if canImport(Sparkle)
divider
settingsSection("Updates") {
Toggle("Automatically check for updates", isOn: automaticallyChecksForUpdates)

settingsSection("Dock Badge") {
Toggle("Show completed torrents count", isOn: $dockShowCompletedBadge)
Toggle("Show download rate", isOn: $dockShowDownloadSpeed)
Toggle("Show upload rate", isOn: $dockShowUploadSpeed)
}
HStack(alignment: .firstTextBaseline) {
Button("Check for Updates…", action: appUpdater.checkForUpdates)
.disabled(!appUpdater.canCheckForUpdates)

divider
Spacer()

settingsSection("Connection Settings") {
HStack {
Text("Startup connection")
Spacer()
Picker("", selection: .fromRawValue(rawValue: $startupBehaviorRaw, defaultValue: AppDefaults.startupConnectionBehavior)) {
Text("Last used server").tag(StartupConnectionBehavior.lastUsed)
Text("Default server").tag(StartupConnectionBehavior.defaultServer)
}
.pickerStyle(.menu)
}
.help("Choose which server BitDream connects to when it launches.")

HStack {
Text("Auto-refresh interval")
Spacer()
Picker("", selection: $store.pollInterval) {
ForEach(SettingsView.pollIntervalOptions, id: \.self) { interval in
Text(SettingsView.formatInterval(interval)).tag(interval)
}
Text("Last checked: \(lastUpdateCheckText)")
.font(.caption2)
.foregroundStyle(.tertiary)
}
.pickerStyle(.menu)
}
}
#endif

#if canImport(Sparkle)
divider
settingsSection("Updates") {
Toggle("Automatically check for updates", isOn: automaticallyChecksForUpdates)
divider

HStack(alignment: .firstTextBaseline) {
Button("Check for Updates…", action: appUpdater.checkForUpdates)
.disabled(!appUpdater.canCheckForUpdates)
settingsSection("Notifications") {
Toggle("Show notifications for completed torrents", isOn: .constant(false))
.disabled(true)

Spacer()

Text("Last checked: \(lastUpdateCheckText)")
Text("Advanced settings coming soon")
.font(.caption2)
.foregroundStyle(.tertiary)
.foregroundColor(.orange)
.padding(.horizontal, 6)
.padding(.vertical, 2)
.background(Color.orange.opacity(0.2))
.cornerRadius(4)
}
}
#endif

divider

settingsSection("Notifications") {
Toggle("Show notifications for completed torrents", isOn: .constant(false))
.disabled(true)

Text("Advanced settings coming soon")
.font(.caption2)
.foregroundColor(.orange)
.padding(.horizontal, 6)
.padding(.vertical, 2)
.background(Color.orange.opacity(0.2))
.cornerRadius(4)
}

divider

settingsSection("Reset") {
Button("Reset All Settings") {
SettingsView.resetAllSettings(
store: store,
themeManager: themeManager,
userDefaults: userDefaults
)
#if canImport(Sparkle)
appUpdater.resetToDefaults()
#endif
divider

settingsSection("Reset") {
Button("Reset All Settings") {
SettingsView.resetAllSettings(
store: store,
themeManager: themeManager,
userDefaults: userDefaults
)
#if canImport(Sparkle)
appUpdater.resetToDefaults()
#endif
}
}
}
.padding(16)
}
.padding(16)
}
Spacer()
.padding(20)
.frame(maxWidth: .infinity, alignment: .topLeading)
}
.padding(20)
.frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .topLeading)
.scrollBounceBehavior(.basedOnSize)
}

@ViewBuilder
Expand Down
30 changes: 16 additions & 14 deletions BitDream/Views/macOS/Settings/macOSSettingsView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,22 +68,24 @@ private struct SettingsServerTab<Content: View>: View {
let content: (TransmissionSessionResponseArguments, SettingsViewModel) -> Content

var body: some View {
VStack(alignment: .leading, spacing: 20) {
if let config {
content(config, editModel)
SettingsSaveStateView(state: editModel.saveState)
Spacer()
} else {
ContentUnavailableView(
"No Server Connected",
systemImage: unavailableSystemImage,
description: Text(unavailableDescription)
)
.frame(maxWidth: .infinity, maxHeight: .infinity)
ScrollView {
VStack(alignment: .leading, spacing: 20) {
if let config {
content(config, editModel)
SettingsSaveStateView(state: editModel.saveState)
} else {
ContentUnavailableView(
"No Server Connected",
systemImage: unavailableSystemImage,
description: Text(unavailableDescription)
)
.frame(maxWidth: .infinity, minHeight: 250)
}
}
.padding(20)
.frame(maxWidth: .infinity, alignment: .topLeading)
}
.padding(20)
.frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .topLeading)
.scrollBounceBehavior(.basedOnSize)
.bindSettingsViewModel(editModel, to: store)
}
}
Expand Down
Loading