Adjust detection of interfaceMode ('dark/light') to handle auto-switc…

…hing intro'd in 10.15
munki · Aug 26, 2021 · e1ad739 · e1ad739
1 parent 0cd2f68
commit e1ad739
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/code/apps/Managed Software Center/Managed Software Center/mschtml.swift b/code/apps/Managed Software Center/Managed Software Center/mschtml.swift
@@ -17,13 +17,19 @@ extension Array {
     }
 }
 
+
 func interfaceTheme() -> String {
     // Returns "dark" if using Dark Mode, otherwise "light"
-    if #available(OSX 10.10, *) {
+    if #available(OSX 10.15, *) {
+        let appearanceDescription = NSApplication.shared.effectiveAppearance.debugDescription.lowercased()
+        if appearanceDescription.contains("dark") {
+            return "dark"
+        }
+    } else if #available(OSX 10.10, *) {
         let os_vers = OperatingSystemVersion(majorVersion: 10, minorVersion: 14, patchVersion: 0)
         if ProcessInfo().isOperatingSystemAtLeast(os_vers) || UserDefaults.standard.bool(forKey: "AllowDarkModeOnUnsupportedOSes") {
-            if let interfaceType = UserDefaults.standard.string(forKey: "AppleInterfaceStyle") {
-                if interfaceType == "Dark" {
+            if let appleInterfaceStyle = UserDefaults.standard.string(forKey: "AppleInterfaceStyle") {
+                if appleInterfaceStyle.lowercased().contains("dark") {
                     return "dark"
                 }
             }
@@ -32,6 +38,7 @@ func interfaceTheme() -> String {
     return "light"
 }
 
+
 func getRawTemplate(_ template_name: String) -> String {
     // return a raw html template.
     let customTemplatesPath = NSString.path(withComponents: [html_dir(), "custom/templates"])