feat: add nativeTheme.themeSource to allow apps to override Chromiums theme choice (#19960)
* feat: add nativeTheme.shouldUseDarkColorsOverride to allow apps to override Chromiums theme choice * spec: add tests for shouldUseDarkColorsOverride * chore: add missing forward declarations * refactor: rename overrideShouldUseDarkColors to themeSource * chore: only run appLevelAppearance specs on Mojave and up * chore: update patch with more info and no define * Update spec-main/api-native-theme-spec.ts Co-Authored-By: Jeremy Apthorp <jeremya@chromium.org> * Update api-native-theme-spec.ts * Update api-native-theme-spec.ts * Update api-native-theme-spec.ts
This commit is contained in:
parent
137622931b
commit
0d16be9560
10 changed files with 294 additions and 3 deletions
|
@ -4,6 +4,8 @@
|
|||
|
||||
#include "shell/common/api/atom_api_native_theme.h"
|
||||
|
||||
#include <string>
|
||||
|
||||
#include "native_mate/dictionary.h"
|
||||
#include "native_mate/object_template_builder.h"
|
||||
#include "shell/common/node_includes.h"
|
||||
|
@ -28,6 +30,20 @@ void NativeTheme::OnNativeThemeUpdated(ui::NativeTheme* theme) {
|
|||
Emit("updated");
|
||||
}
|
||||
|
||||
void NativeTheme::SetThemeSource(ui::NativeTheme::ThemeSource override) {
|
||||
theme_->set_theme_source(override);
|
||||
#if defined(OS_MACOSX)
|
||||
// Update the macOS appearance setting for this new override value
|
||||
UpdateMacOSAppearanceForOverrideValue(override);
|
||||
#endif
|
||||
// TODO(MarshallOfSound): Update all existing browsers windows to use GTK dark
|
||||
// theme
|
||||
}
|
||||
|
||||
ui::NativeTheme::ThemeSource NativeTheme::GetThemeSource() const {
|
||||
return theme_->theme_source();
|
||||
}
|
||||
|
||||
bool NativeTheme::ShouldUseDarkColors() {
|
||||
return theme_->ShouldUseDarkColors();
|
||||
}
|
||||
|
@ -68,6 +84,8 @@ void NativeTheme::BuildPrototype(v8::Isolate* isolate,
|
|||
prototype->SetClassName(mate::StringToV8(isolate, "NativeTheme"));
|
||||
mate::ObjectTemplateBuilder(isolate, prototype->PrototypeTemplate())
|
||||
.SetProperty("shouldUseDarkColors", &NativeTheme::ShouldUseDarkColors)
|
||||
.SetProperty("themeSource", &NativeTheme::GetThemeSource,
|
||||
&NativeTheme::SetThemeSource)
|
||||
.SetProperty("shouldUseHighContrastColors",
|
||||
&NativeTheme::ShouldUseHighContrastColors)
|
||||
.SetProperty("shouldUseInvertedColorScheme",
|
||||
|
@ -94,4 +112,42 @@ void Initialize(v8::Local<v8::Object> exports,
|
|||
|
||||
} // namespace
|
||||
|
||||
namespace mate {
|
||||
|
||||
v8::Local<v8::Value> Converter<ui::NativeTheme::ThemeSource>::ToV8(
|
||||
v8::Isolate* isolate,
|
||||
const ui::NativeTheme::ThemeSource& val) {
|
||||
switch (val) {
|
||||
case ui::NativeTheme::ThemeSource::kForcedDark:
|
||||
return mate::ConvertToV8(isolate, "dark");
|
||||
case ui::NativeTheme::ThemeSource::kForcedLight:
|
||||
return mate::ConvertToV8(isolate, "light");
|
||||
case ui::NativeTheme::ThemeSource::kSystem:
|
||||
default:
|
||||
return mate::ConvertToV8(isolate, "system");
|
||||
}
|
||||
}
|
||||
|
||||
bool Converter<ui::NativeTheme::ThemeSource>::FromV8(
|
||||
v8::Isolate* isolate,
|
||||
v8::Local<v8::Value> val,
|
||||
ui::NativeTheme::ThemeSource* out) {
|
||||
std::string theme_source;
|
||||
if (mate::ConvertFromV8(isolate, val, &theme_source)) {
|
||||
if (theme_source == "dark") {
|
||||
*out = ui::NativeTheme::ThemeSource::kForcedDark;
|
||||
} else if (theme_source == "light") {
|
||||
*out = ui::NativeTheme::ThemeSource::kForcedLight;
|
||||
} else if (theme_source == "system") {
|
||||
*out = ui::NativeTheme::ThemeSource::kSystem;
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
} // namespace mate
|
||||
|
||||
NODE_LINKED_MODULE_CONTEXT_AWARE(atom_common_native_theme, Initialize)
|
||||
|
|
|
@ -7,6 +7,7 @@
|
|||
|
||||
#include "native_mate/handle.h"
|
||||
#include "shell/browser/api/event_emitter.h"
|
||||
#include "ui/native_theme/native_theme.h"
|
||||
#include "ui/native_theme/native_theme_observer.h"
|
||||
|
||||
namespace electron {
|
||||
|
@ -25,6 +26,12 @@ class NativeTheme : public mate::EventEmitter<NativeTheme>,
|
|||
NativeTheme(v8::Isolate* isolate, ui::NativeTheme* theme);
|
||||
~NativeTheme() override;
|
||||
|
||||
void SetThemeSource(ui::NativeTheme::ThemeSource override);
|
||||
#if defined(OS_MACOSX)
|
||||
void UpdateMacOSAppearanceForOverrideValue(
|
||||
ui::NativeTheme::ThemeSource override);
|
||||
#endif
|
||||
ui::NativeTheme::ThemeSource GetThemeSource() const;
|
||||
bool ShouldUseDarkColors();
|
||||
bool ShouldUseHighContrastColors();
|
||||
bool ShouldUseInvertedColorScheme();
|
||||
|
@ -42,4 +49,17 @@ class NativeTheme : public mate::EventEmitter<NativeTheme>,
|
|||
|
||||
} // namespace electron
|
||||
|
||||
namespace mate {
|
||||
|
||||
template <>
|
||||
struct Converter<ui::NativeTheme::ThemeSource> {
|
||||
static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
|
||||
const ui::NativeTheme::ThemeSource& val);
|
||||
static bool FromV8(v8::Isolate* isolate,
|
||||
v8::Local<v8::Value> val,
|
||||
ui::NativeTheme::ThemeSource* out);
|
||||
};
|
||||
|
||||
} // namespace mate
|
||||
|
||||
#endif // SHELL_COMMON_API_ATOM_API_NATIVE_THEME_H_
|
||||
|
|
37
shell/common/api/atom_api_native_theme_mac.mm
Normal file
37
shell/common/api/atom_api_native_theme_mac.mm
Normal file
|
@ -0,0 +1,37 @@
|
|||
// Copyright (c) 2019 Slack Technologies, Inc.
|
||||
// Use of this source code is governed by the MIT license that can be
|
||||
// found in the LICENSE file.
|
||||
|
||||
#include "shell/common/api/atom_api_native_theme.h"
|
||||
|
||||
#include "base/mac/sdk_forward_declarations.h"
|
||||
#include "shell/browser/mac/atom_application.h"
|
||||
|
||||
namespace electron {
|
||||
|
||||
namespace api {
|
||||
|
||||
void NativeTheme::UpdateMacOSAppearanceForOverrideValue(
|
||||
ui::NativeTheme::ThemeSource override) {
|
||||
if (@available(macOS 10.14, *)) {
|
||||
NSAppearance* new_appearance;
|
||||
switch (override) {
|
||||
case ui::NativeTheme::ThemeSource::kForcedDark:
|
||||
new_appearance =
|
||||
[NSAppearance appearanceNamed:NSAppearanceNameDarkAqua];
|
||||
break;
|
||||
case ui::NativeTheme::ThemeSource::kForcedLight:
|
||||
new_appearance = [NSAppearance appearanceNamed:NSAppearanceNameAqua];
|
||||
break;
|
||||
case ui::NativeTheme::ThemeSource::kSystem:
|
||||
default:
|
||||
new_appearance = nil;
|
||||
break;
|
||||
}
|
||||
[[NSApplication sharedApplication] setAppearance:new_appearance];
|
||||
}
|
||||
}
|
||||
|
||||
} // namespace api
|
||||
|
||||
} // namespace electron
|
Loading…
Add table
Add a link
Reference in a new issue