Pass down high-contrast theme pref

tropy · Nov 19, 2019 · d69c953 · d69c953
1 parent b05bd56
commit d69c953
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/src/browser/tropy.js b/src/browser/tropy.js
@@ -921,7 +921,11 @@ class Tropy extends EventEmitter {
     if (theme !== nativeTheme.themeSource)
       nativeTheme.themeSource = theme
 
-    this.wm.broadcast('theme', theme, nativeTheme.shouldUseDarkColors)
+    this.wm.broadcast('theme', theme, {
+      dark: nativeTheme.shouldUseDarkColors,
+      contrast: nativeTheme.shouldUseHighContrastColors
+    })
+
     this.emit('app:reload-menu')
   }
 

diff --git a/src/browser/wm.js b/src/browser/wm.js
@@ -507,7 +507,7 @@ class WindowManager extends EventEmitter {
 
   static getAquaColorVariant() {
     return darwin && AQUA[
-      prefs.getUserDefault('AppleAquaColorVariant', 'integer')
+      prefs.getUserDefault('AppleAquaColorVariant', 'string')
     ]
   }
 

diff --git a/src/window.js b/src/window.js
@@ -48,6 +48,7 @@ class Window extends EventEmitter {
       'scrollbars',
       'theme',
       'dark',
+      'constrast',
       'maximizable',
       'minimizable'
     ])
@@ -137,10 +138,9 @@ class Window extends EventEmitter {
         this.toggle(state)
         this.emit(state)
       })
-      .on('theme', (_, theme, dark) => {
-        args.update({ theme, dark })
-        this.state.theme = theme
-        this.state.dark = dark
+      .on('theme', (_, theme, { dark, contrast } = {}) => {
+        args.update({ theme, dark, contrast })
+        Object.assign(this.state, { theme, dark, contrast })
         this.style(true)
       })
       .on('recent', (_, recent) => {