From 441e6466dea0c66a03d4eeadec0e422cbcf8dd93 Mon Sep 17 00:00:00 2001
From: CandyFace <CandyFace18@gmail.com>
Date: Sat, 15 Dec 2018 18:38:07 +0100
Subject: [PATCH] Force light theme on mac os

Qt is not ready for Mojave dark mode yet and since there's no reliable way to determine whether the OS runs AquaDark, we'll force the standard light theme for now.
---
 app/data/Info.plist                          |  2 ++
 core_lib/src/external/macosx/macosxnative.mm | 11 ++++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/data/Info.plist b/app/data/Info.plist
index 59810cf11..4ef87675f 100644
--- a/app/data/Info.plist
+++ b/app/data/Info.plist
@@ -45,6 +45,8 @@
 			</array>
 		</dict>
 	</array>
+        <key>NSRequiresAquaSystemAppearance</key>
+        <string>True</string>
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIconFile</key>
diff --git a/core_lib/src/external/macosx/macosxnative.mm b/core_lib/src/external/macosx/macosxnative.mm
index 1bd789b86..b468a7579 100644
--- a/core_lib/src/external/macosx/macosxnative.mm
+++ b/core_lib/src/external/macosx/macosxnative.mm
@@ -28,11 +28,12 @@ void setMouseCoalescingEnabled(bool enabled)
 
     bool isDarkMode()
     {
-        NSAppearance* apperance = NSAppearance.currentAppearance;
-
-        #ifdef __MAC_10_14
-            return apperance.name == NSAppearanceNameDarkAqua;
-        #endif
+//        #ifdef __MAC_10_14
+//            #if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_14
+//            NSAppearance* apperance = NSAppearance.currentAppearance;
+//            return apperance.name == NSAppearanceNameDarkAqua;
+//            #endif
+//        #endif
 
         return false;
     }