github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

refactor: use NativeTheme dark mode detection on macOS 10.14+ (#19309)

Browse Source
This commit is contained in:
Micha Hanselmann
2019-07-17 14:32:11 -07:00
committed by Shelley Vohr
parent b7408e61d2
commit 450a83d0f7
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
atom/browser/api/atom_api_system_preferences_mac.mm
View File

@@ -25,6 +25,7 @@
#include "base/values.h"
#include "native_mate/object_template_builder.h"
#include "net/base/mac/url_conversions.h"
#include "ui/native_theme/native_theme.h"
namespace mate {
template <>
@@ -626,8 +627,7 @@ void SystemPreferences::RemoveUserDefault(const std::string& name) {
bool SystemPreferences::IsDarkMode() {
if (@available(macOS 10.15, *)) {
return [[NSApplication sharedApplication].effectiveAppearance.name
isEqualToString:NSAppearanceNameDarkAqua];
return ui::NativeTheme::GetInstanceForNativeUi()->SystemDarkModeEnabled();
}
NSString* mode = [[NSUserDefaults standardUserDefaults]
stringForKey:@"AppleInterfaceStyle"];

4
atom/browser/ui/tray_icon_cocoa.mm
View File

@@ -17,6 +17,7 @@
#include "ui/events/cocoa/cocoa_event_utils.h"
#include "ui/gfx/image/image.h"
#include "ui/gfx/mac/coordinate_conversion.h"
#include "ui/native_theme/native_theme.h"
namespace {
@@ -150,8 +151,7 @@ const CGFloat kVerticalTitleMargin = 2;
- (BOOL)isDarkMode {
if (@available(macOS 10.15, *)) {
return [[NSApplication sharedApplication].effectiveAppearance.name
isEqualToString:NSAppearanceNameDarkAqua];
return ui::NativeTheme::GetInstanceForNativeUi()->SystemDarkModeEnabled();
}
NSUserDefaults* defaults = [NSUserDefaults standardUserDefaults];
NSString* mode = [defaults stringForKey:@"AppleInterfaceStyle"];