Reduce transparency slightly by default (#22)

LunarBar-app · Jan 11, 2024 · e36efad · e36efad
1 parent 28b3a28
commit e36efad
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 5 deletions.
diff --git a/LunarBarMac/Modules/Sources/AppKitExtensions/NSPopover+Extension.swift b/LunarBarMac/Modules/Sources/AppKitExtensions/NSPopover+Extension.swift
@@ -7,12 +7,12 @@
 import AppKit
 
 public extension NSPopover {
-  var reduceTransparency: Bool {
+  var material: NSVisualEffectView.Material {
     get {
-      visualEffectView?.material == .windowBackground
+      visualEffectView?.material ?? .popover
     }
     set {
-      visualEffectView?.material = newValue ? .windowBackground : .popover
+      visualEffectView?.material = newValue
     }
   }
 }

diff --git a/LunarBarMac/Sources/Main/AppMainVC+Menu.swift b/LunarBarMac/Sources/Main/AppMainVC+Menu.swift
@@ -174,7 +174,7 @@ private extension AppMainVC {
 
     menu.addItem(withTitle: Localized.UI.menuTitleReduceTransparency) { [weak self] in
       AppPreferences.Accessibility.reduceTransparency.toggle()
-      self?.popover?.reduceTransparency = AppPreferences.Accessibility.reduceTransparency
+      self?.popover?.material = AppPreferences.Accessibility.popoverMaterial
     }
     .setOn(AppPreferences.Accessibility.reduceTransparency)
 

diff --git a/LunarBarMac/Sources/Main/AppMainVC.swift b/LunarBarMac/Sources/Main/AppMainVC.swift
@@ -53,7 +53,7 @@ extension AppMainVC {
 
   override func viewDidAppear() {
     super.viewDidAppear()
-    popover?.reduceTransparency = AppPreferences.Accessibility.reduceTransparency
+    popover?.material = AppPreferences.Accessibility.popoverMaterial
 
     updateAppearance()
     updateCalendar()

diff --git a/LunarBarMac/Sources/Shared/AppPreferences.swift b/LunarBarMac/Sources/Shared/AppPreferences.swift
@@ -49,6 +49,10 @@ enum AppPreferences {
 
     @Storage(key: "accessibility.reduce-transparency", defaultValue: false)
     static var reduceTransparency: Bool
+
+    static var popoverMaterial: NSVisualEffectView.Material {
+      reduceTransparency ? .windowBackground : .menu
+    }
   }
 }
 

diff --git a/Screenshots/01.png b/Screenshots/01.png
diff --git a/Screenshots/02.png b/Screenshots/02.png