Add WidgetAppearance.autoCompact

pqrs-org · Feb 20, 2025 · 08f6a98 · 08f6a98
1 parent 44b18bc
commit 08f6a98
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 2 deletions.
diff --git a/src/TrueWidget/swift/TrueWidgetApp.swift b/src/TrueWidget/swift/TrueWidgetApp.swift
@@ -92,7 +92,17 @@ struct TrueWidgetApp: App {
               title: "Compact",
               checked: userSettings.widgetAppearance == WidgetAppearance.compact.rawValue)
           }
+        )
 
+        Button(
+          action: {
+            userSettings.widgetAppearance = WidgetAppearance.autoCompact.rawValue
+          },
+          label: {
+            checkmarkLabel(
+              title: "Auto Compact",
+              checked: userSettings.widgetAppearance == WidgetAppearance.autoCompact.rawValue)
+          }
         )
 
         Button(

diff --git a/src/TrueWidget/swift/UserSettings.swift b/src/TrueWidget/swift/UserSettings.swift
@@ -24,6 +24,7 @@ enum WidgetScreen: String {
 enum WidgetAppearance: String {
   case normal
   case compact
+  case autoCompact
   case hidden
 }
 

diff --git a/src/TrueWidget/swift/Views/ContentView.swift b/src/TrueWidget/swift/Views/ContentView.swift
@@ -5,6 +5,7 @@ struct ContentView: View {
   @Environment(\.openSettingsLegacy) var openSettingsLegacy
   private var window: NSWindow
   @ObservedObject private var userSettings: UserSettings
+  @StateObject private var displayMonitor = DisplayMonitor()
 
   @State private var hidden = false
   private let windowPositionManager: WindowPositionManager
@@ -17,7 +18,7 @@ struct ContentView: View {
 
   var body: some View {
     VStack {
-      if userSettings.widgetAppearance == WidgetAppearance.compact.rawValue {
+      if isCompactView() {
         CompactView(userSettings: userSettings)
       } else {
         VStack(alignment: .leading, spacing: 10.0) {
@@ -47,7 +48,7 @@ struct ContentView: View {
       }
     }
     .padding()
-    .if(userSettings.widgetAppearance != WidgetAppearance.compact.rawValue) {
+    .if(!isCompactView()) {
       $0.frame(width: userSettings.widgetWidth)
     }
     .fixedSize()
@@ -91,4 +92,18 @@ struct ContentView: View {
       }
     }
   }
+
+  private func isCompactView() -> Bool {
+    switch userSettings.widgetAppearance {
+    case WidgetAppearance.compact.rawValue:
+      return true
+    case WidgetAppearance.autoCompact.rawValue:
+      if displayMonitor.displayCount == 1 {
+        return true
+      }
+      return false
+    default:
+      return false
+    }
+  }
 }
diff --git a/src/TrueWidget/swift/Views/Settings/SettingsMainView.swift b/src/TrueWidget/swift/Views/Settings/SettingsMainView.swift
@@ -118,6 +118,7 @@ struct SettingsMainView: View {
           Picker("", selection: $userSettings.widgetAppearance) {
             Text("Normal").tag(WidgetAppearance.normal.rawValue)
             Text("Compact").tag(WidgetAppearance.compact.rawValue)
+            Text("Auto Compact").tag(WidgetAppearance.autoCompact.rawValue)
             Text("Hidden").tag(WidgetAppearance.hidden.rawValue)
           }
           .pickerStyle(.radioGroup)