Enable HDR playback again in macOS Sonoma in System Settings

Fix m/s unit not being displayed correctly in forecasts
JohnCoates · Jun 14, 2023 · 1971fa5 · 1971fa5
1 parent 4b6b75f
commit 1971fa5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/Aerial/Source/Models/Aerial.swift b/Aerial/Source/Models/Aerial.swift
@@ -21,7 +21,7 @@ class Aerial: NSObject {
     // We also track darkmode here now
     var darkMode = false
 
-    // And we track if we are running under Aerial's Companion app
+    // And we track if we are running under Aerial's Companion 
     var underCompanion = false
 
     let userName = NSUserName()
@@ -38,7 +38,7 @@ class Aerial: NSObject {
     }()
 
 
-    // Using HDR will crash System Settings in macOS 13. This is fixed in macOS 14
+    // Using HDR in the panel will crash System Settings in macOS 13. This is fixed in macOS 14 🎉
     func canHDR() -> Bool {
         if #available(OSX 13.0, *) {
             if #unavailable(OSX 14.0) {

diff --git a/Aerial/Source/Views/Layers/Weather/ForecastLayer.swift b/Aerial/Source/Views/Layers/Weather/ForecastLayer.swift
@@ -362,7 +362,11 @@ class ForecastLayer: CALayer {
         let windLayer = CAVCTextLayer()
 
         if PrefsInfo.weather.degree == .celsius {
-            windLayer.string = "km/h"
+            if PrefsInfo.weatherWindMode == .kph {
+                windLayer.string = "km/h"
+            } else {
+                windLayer.string = "m/s"
+            }
         } else {
             windLayer.string = "mph"
         }
@@ -458,7 +462,7 @@ class ForecastLayer: CALayer {
         } else {
             wind.string = String(format: "%.0f", speed)
         }
-
+        
         // Get something large first
         (wind.font, wind.fontSize) = wind.makeFont(name: PrefsInfo.weather.fontName, size: size)