mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

fix: macOS getColor inconsistencies (#20611)

Browse source
This commit is contained in:
Shelley Vohr 2019-10-21 14:31:03 -07:00 • committed by GitHub
parent 9a5cd4c8d2
commit aa26e8b946
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 75 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
shell/browser/api/atom_api_system_preferences.h
View file

@ -13,6 +13,7 @@
#include "native_mate/handle.h"
#include "shell/browser/api/event_emitter_deprecated.h"
#include "shell/common/gin_helper/error_thrower.h"
#include "shell/common/node_includes.h"
#include "shell/common/promise_util.h"
#if defined(OS_WIN)
@ -52,7 +53,8 @@ class SystemPreferences : public mate::EventEmitter<SystemPreferences>
#if defined(OS_WIN) || defined(OS_MACOSX)
std::string GetAccentColor();
std::string GetColor(const std::string& color, mate::Arguments* args);
std::string GetColor(gin_helper::ErrorThrower thrower,
const std::string& color);
#endif
#if defined(OS_WIN)
bool IsAeroGlassEnabled();

19
shell/browser/api/atom_api_system_preferences_mac.mm
View file

@ -26,6 +26,7 @@
#include "shell/browser/mac/atom_application.h"
#include "shell/browser/mac/dict_util.h"
#include "shell/browser/ui/cocoa/NSColor+Hex.h"
#include "shell/common/deprecate_util.h"
#include "shell/common/native_mate_converters/gurl_converter.h"
#include "shell/common/native_mate_converters/value_converter.h"
#include "ui/native_theme/native_theme.h"
@ -503,18 +504,23 @@ bool SystemPreferences::IsTrustedAccessibilityClient(bool prompt) {
return AXIsProcessTrustedWithOptions((CFDictionaryRef)options);
}
std::string SystemPreferences::GetColor(const std::string& color,
mate::Arguments* args) {
std::string SystemPreferences::GetColor(gin_helper::ErrorThrower thrower,
const std::string& color) {
NSColor* sysColor = nil;
if (color == "alternate-selected-control-text") {
sysColor = [NSColor alternateSelectedControlTextColor];
EmitDeprecationWarning(
node::Environment::GetCurrent(thrower.isolate()),
"'alternate-selected-control-text' is deprecated as an input to "
"getColor. Use 'selected-content-background' instead.",
"electron");
} else if (color == "control-background") {
sysColor = [NSColor controlBackgroundColor];
} else if (color == "control") {
sysColor = [NSColor controlColor];
} else if (color == "control-text") {
sysColor = [NSColor controlTextColor];
} else if (color == "disabled-control") {
} else if (color == "disabled-control-text") {
sysColor = [NSColor disabledControlTextColor];
} else if (color == "find-highlight") {
if (@available(macOS 10.14, *))
@ -580,11 +586,12 @@ std::string SystemPreferences::GetColor(const std::string& color,
} else if (color == "window-frame-text") {
sysColor = [NSColor windowFrameTextColor];
} else {
args->ThrowError("Unknown color: " + color);
return "";
thrower.ThrowError("Unknown color: " + color);
}
return base::SysNSStringToUTF8([sysColor hexadecimalValue]);
if (sysColor)
return base::SysNSStringToUTF8([sysColor hexadecimalValue]);
return "";
}
std::string SystemPreferences::GetMediaAccessStatus(

6
shell/browser/api/atom_api_system_preferences_win.cc
View file

@ -46,8 +46,8 @@ std::string SystemPreferences::GetAccentColor() {
return hexColorDWORDToRGBA(color);
}
std::string SystemPreferences::GetColor(const std::string& color,
mate::Arguments* args) {
std::string SystemPreferences::GetColor(gin_helper::ErrorThrower thrower,
const std::string& color) {
int id;
if (color == "3d-dark-shadow") {
id = COLOR_3DDKSHADOW;
@ -110,7 +110,7 @@ std::string SystemPreferences::GetColor(const std::string& color,
} else if (color == "window-text") {
id = COLOR_WINDOWTEXT;
} else {
args->ThrowError("Unknown color: " + color);
thrower.ThrowError("Unknown color: " + color);
return "";
}