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

fix: undefined backgroundColor (#32517)

Browse source
This commit is contained in:
Shelley Vohr 2022-01-19 21:51:12 +01:00 committed by GitHub
parent b89361a991
commit df50a0efb1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
shell/browser/api/electron_api_browser_window.cc
View file

@ -37,7 +37,6 @@ BrowserWindow::BrowserWindow(gin::Arguments* args,
gin::Dictionary::CreateEmpty(isolate); gin::Dictionary::CreateEmpty(isolate);
options.Get(options::kWebPreferences, &web_preferences); options.Get(options::kWebPreferences, &web_preferences);
v8::Local<v8::Value> value;
bool transparent = false; bool transparent = false;
options.Get(options::kTransparent, &transparent); options.Get(options::kTransparent, &transparent);
@ -47,8 +46,9 @@ BrowserWindow::BrowserWindow(gin::Arguments* args,
#endif #endif
// Copy the backgroundColor to webContents. // Copy the backgroundColor to webContents.
if (options.Get(options::kBackgroundColor, &value)) { std::string color;
web_preferences.SetHidden(options::kBackgroundColor, value); if (options.Get(options::kBackgroundColor, &color)) {
web_preferences.SetHidden(options::kBackgroundColor, color);
} else if (!vibrancy_type.empty() || transparent) { } else if (!vibrancy_type.empty() || transparent) {
// If the BrowserWindow is transparent or a vibrancy type has been set, // If the BrowserWindow is transparent or a vibrancy type has been set,
// also propagate transparency to the WebContents unless a separate // also propagate transparency to the WebContents unless a separate
@ -79,6 +79,7 @@ BrowserWindow::BrowserWindow(gin::Arguments* args,
} }
// Copy the webContents option to webPreferences. // Copy the webContents option to webPreferences.
v8::Local<v8::Value> value;
if (options.Get("webContents", &value)) { if (options.Get("webContents", &value)) {
web_preferences.SetHidden("webContents", value); web_preferences.SetHidden("webContents", value);
} }