Skip to content

Commit 1bcc306

Browse files
committed
Misc interface changes
1 parent 3f08f0b commit 1bcc306

File tree

2 files changed

+23
-10
lines changed

2 files changed

+23
-10
lines changed

Ice/Settings/SettingsView.swift

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,26 +11,38 @@ struct SettingsView: View {
1111

1212
private var sidebarWidth: CGFloat {
1313
switch sidebarRowSize {
14-
case .small: 206
14+
case .small: 190
1515
case .medium: 210
16-
case .large: 214
16+
case .large: 230
1717
@unknown default: 210
1818
}
1919
}
2020

21+
private var sidebarItemHeight: CGFloat {
22+
switch sidebarRowSize {
23+
case .small: 26
24+
case .medium: 32
25+
case .large: 34
26+
@unknown default: 32
27+
}
28+
}
29+
30+
private var sidebarItemFontSize: CGFloat {
31+
switch sidebarRowSize {
32+
case .small: 13
33+
case .medium: 15
34+
case .large: 16
35+
@unknown default: 15
36+
}
37+
}
38+
2139
var body: some View {
2240
NavigationSplitView {
2341
sidebar
2442
} detail: {
2543
detailView
2644
}
2745
.navigationTitle(navigationState.settingsNavigationIdentifier.localized)
28-
.frame(minWidth: 825, minHeight: 500)
29-
.background {
30-
VisualEffectView(material: .contentBackground, blendingMode: .behindWindow)
31-
.opacity(0.25)
32-
.blendMode(.softLight)
33-
}
3446
}
3547

3648
@ViewBuilder
@@ -77,12 +89,12 @@ struct SettingsView: View {
7789
private func sidebarItem(for identifier: SettingsNavigationIdentifier) -> some View {
7890
Label {
7991
Text(identifier.localized)
80-
.font(.title3)
92+
.font(.system(size: sidebarItemFontSize))
8193
.padding(.leading, 2)
8294
} icon: {
8395
icon(for: identifier).view
8496
}
85-
.frame(height: 32)
97+
.frame(height: sidebarItemHeight)
8698
}
8799

88100
private func icon(for identifier: SettingsNavigationIdentifier) -> IconResource {

Ice/Settings/SettingsWindow.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ struct SettingsWindow: Scene {
1717
}
1818
appState.assignSettingsWindow(window)
1919
}
20+
.frame(minWidth: 825, minHeight: 500)
2021
}
2122
.commandsRemoved()
2223
.windowResizability(.contentSize)

0 commit comments

Comments
 (0)