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

kVibrancyType should be read in InitFromOptions

Browse source
This commit is contained in:
Cheng Zhao 2018-04-10 16:54:07 +09:00
parent cfd8ea8eb0
commit 5a95aaaa54
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
atom/browser/native_window.cc
View file

@ -131,6 +131,12 @@ void NativeWindow::InitFromOptions(const mate::Dictionary& options) {
if (options.Get(options::kKiosk, &kiosk) && kiosk) { if (options.Get(options::kKiosk, &kiosk) && kiosk) {
SetKiosk(kiosk); SetKiosk(kiosk);
} }
#if defined(OS_MACOSX)
std::string type;
if (options.Get(options::kVibrancyType, &type)) {
SetVibrancy(type);
}
#endif
std::string color; std::string color;
if (options.Get(options::kBackgroundColor, &color)) { if (options.Get(options::kBackgroundColor, &color)) {
SetBackgroundColor(ParseHexColor(color)); SetBackgroundColor(ParseHexColor(color));

5
atom/browser/native_window_mac.mm
View file

@ -970,11 +970,6 @@ NativeWindowMac::NativeWindowMac(const mate::Dictionary& options,
return event; return event;
}]; }];
std::string type;
if (options.Get(options::kVibrancyType, &type)) {
SetVibrancy(type);
}
// Set maximizable state last to ensure zoom button does not get reset // Set maximizable state last to ensure zoom button does not get reset
// by calls to other APIs. // by calls to other APIs.
SetMaximizable(maximizable); SetMaximizable(maximizable);