Misc interface changes

jordanbaird · Oct 5, 2024 · 1bcc306 · 1bcc306
1 parent 3f08f0b
commit 1bcc306
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 10 deletions.
diff --git a/Ice/Settings/SettingsView.swift b/Ice/Settings/SettingsView.swift
@@ -11,26 +11,38 @@ struct SettingsView: View {
 
     private var sidebarWidth: CGFloat {
         switch sidebarRowSize {
-        case .small: 206
+        case .small: 190
         case .medium: 210
-        case .large: 214
+        case .large: 230
         @unknown default: 210
         }
     }
 
+    private var sidebarItemHeight: CGFloat {
+        switch sidebarRowSize {
+        case .small: 26
+        case .medium: 32
+        case .large: 34
+        @unknown default: 32
+        }
+    }
+
+    private var sidebarItemFontSize: CGFloat {
+        switch sidebarRowSize {
+        case .small: 13
+        case .medium: 15
+        case .large: 16
+        @unknown default: 15
+        }
+    }
+
     var body: some View {
         NavigationSplitView {
             sidebar
         } detail: {
             detailView
         }
         .navigationTitle(navigationState.settingsNavigationIdentifier.localized)
-        .frame(minWidth: 825, minHeight: 500)
-        .background {
-            VisualEffectView(material: .contentBackground, blendingMode: .behindWindow)
-                .opacity(0.25)
-                .blendMode(.softLight)
-        }
     }
 
     @ViewBuilder
@@ -77,12 +89,12 @@ struct SettingsView: View {
     private func sidebarItem(for identifier: SettingsNavigationIdentifier) -> some View {
         Label {
             Text(identifier.localized)
-                .font(.title3)
+                .font(.system(size: sidebarItemFontSize))
                 .padding(.leading, 2)
         } icon: {
             icon(for: identifier).view
         }
-        .frame(height: 32)
+        .frame(height: sidebarItemHeight)
     }
 
     private func icon(for identifier: SettingsNavigationIdentifier) -> IconResource {

diff --git a/Ice/Settings/SettingsWindow.swift b/Ice/Settings/SettingsWindow.swift
@@ -17,6 +17,7 @@ struct SettingsWindow: Scene {
                     }
                     appState.assignSettingsWindow(window)
                 }
+                .frame(minWidth: 825, minHeight: 500)
         }
         .commandsRemoved()
         .windowResizability(.contentSize)