From bf796b68af0cd89f87e51cff5fad0cffb6b47bec Mon Sep 17 00:00:00 2001
From: Jordan Baird <jordanbaird.dev@gmail.com>
Date: Thu, 3 Oct 2024 11:16:27 -0600
Subject: [PATCH] Minor interface adjustments

---
 Ice/ControlItem/ControlItem.swift                         | 2 +-
 Ice/MenuBar/MenuBarSection.swift                          | 8 +++++---
 Ice/MenuBar/Search/MenuBarSearchPanel.swift               | 4 ++--
 .../SettingsPanes/MenuBarLayoutSettingsPane.swift         | 5 +++--
 Ice/UI/IceBar/IceBar.swift                                | 2 +-
 Ice/UI/LayoutBar/LayoutBar.swift                          | 2 +-
 6 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/Ice/ControlItem/ControlItem.swift b/Ice/ControlItem/ControlItem.swift
index f12104be..43e4b7b1 100644
--- a/Ice/ControlItem/ControlItem.swift
+++ b/Ice/ControlItem/ControlItem.swift
@@ -461,7 +461,7 @@ final class ControlItem {
                 continue
             }
             let item = NSMenuItem(
-                title: "\(section.isHidden ? "Show" : "Hide") the \(name.menuString) Section",
+                title: "\(section.isHidden ? "Show" : "Hide") the \(name.displayString) Section",
                 action: #selector(toggleMenuBarSection),
                 keyEquivalent: ""
             )
diff --git a/Ice/MenuBar/MenuBarSection.swift b/Ice/MenuBar/MenuBarSection.swift
index 02acca2a..9aeed6f7 100644
--- a/Ice/MenuBar/MenuBarSection.swift
+++ b/Ice/MenuBar/MenuBarSection.swift
@@ -14,19 +14,21 @@ final class MenuBarSection {
         case hidden
         case alwaysHidden
 
-        var menuString: String {
+        /// A string to show in the interface.
+        var displayString: String {
             switch self {
             case .visible: "Visible"
             case .hidden: "Hidden"
-            case .alwaysHidden: "Always Hidden"
+            case .alwaysHidden: "Always-Hidden"
             }
         }
 
+        /// A string to use for logging purposes.
         var logString: String {
             switch self {
             case .visible: "visible section"
             case .hidden: "hidden section"
-            case .alwaysHidden: "always hidden section"
+            case .alwaysHidden: "always-hidden section"
             }
         }
     }
diff --git a/Ice/MenuBar/Search/MenuBarSearchPanel.swift b/Ice/MenuBar/Search/MenuBarSearchPanel.swift
index 214658e3..3a52c24e 100644
--- a/Ice/MenuBar/Search/MenuBarSearchPanel.swift
+++ b/Ice/MenuBar/Search/MenuBarSearchPanel.swift
@@ -248,13 +248,13 @@ private struct MenuBarSearchContentView: View {
     private func updateDisplayedItems() {
         let searchItems: [(listItem: ListItem, title: String)] = MenuBarSection.Name.allCases.reduce(into: []) { items, section in
             let headerItem = ListItem.header(id: .header(section)) {
-                Text(section.menuString)
+                Text(section.displayString)
                     .fontWeight(.semibold)
                     .foregroundStyle(.secondary)
                     .frame(maxWidth: .infinity, alignment: .leading)
                     .padding(.vertical, 10)
             }
-            items.append((headerItem, section.menuString))
+            items.append((headerItem, section.displayString))
 
             for item in itemManager.itemCache.managedItems(for: section).reversed() {
                 let listItem = ListItem.item(id: .item(item.info)) {
diff --git a/Ice/Settings/SettingsPanes/MenuBarLayoutSettingsPane.swift b/Ice/Settings/SettingsPanes/MenuBarLayoutSettingsPane.swift
index 6f2d8661..01f85e7e 100644
--- a/Ice/Settings/SettingsPanes/MenuBarLayoutSettingsPane.swift
+++ b/Ice/Settings/SettingsPanes/MenuBarLayoutSettingsPane.swift
@@ -60,9 +60,10 @@ struct MenuBarLayoutSettingsPane: View {
             let section = appState.menuBarManager.section(withName: section),
             section.isEnabled
         {
-            VStack(alignment: .leading, spacing: 2) {
-                Text(section.name.menuString + " Section")
+            VStack(alignment: .leading, spacing: 4) {
+                Text("\(section.name.displayString) Section")
                     .font(.system(size: 14))
+                    .padding(.leading, 2)
 
                 LayoutBar(section: section)
                     .environmentObject(appState.imageCache)
diff --git a/Ice/UI/IceBar/IceBar.swift b/Ice/UI/IceBar/IceBar.swift
index 002f6e5c..f8e0b915 100644
--- a/Ice/UI/IceBar/IceBar.swift
+++ b/Ice/UI/IceBar/IceBar.swift
@@ -273,7 +273,7 @@ private struct IceBarContentView: View {
         if configuration.hasRoundedShape {
             AnyInsettableShape(Capsule())
         } else {
-            AnyInsettableShape(RoundedRectangle(cornerRadius: frame.height / 5, style: .continuous))
+            AnyInsettableShape(RoundedRectangle(cornerRadius: frame.height / 4, style: .continuous))
         }
     }
 
diff --git a/Ice/UI/LayoutBar/LayoutBar.swift b/Ice/UI/LayoutBar/LayoutBar.swift
index 9c20d2ae..be9e1ce6 100644
--- a/Ice/UI/LayoutBar/LayoutBar.swift
+++ b/Ice/UI/LayoutBar/LayoutBar.swift
@@ -59,6 +59,6 @@ struct LayoutBar: View {
 
     @ViewBuilder
     private var roundedRectangle: some Shape {
-        RoundedRectangle(cornerRadius: 9, style: .circular)
+        RoundedRectangle(cornerRadius: 11, style: .continuous)
     }
 }