Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: undefined backgroundColor #32517

Merged
merged 1 commit into from Jan 19, 2022
Merged

fix: undefined backgroundColor #32517

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 4 additions & 3 deletions shell/browser/api/electron_api_browser_window.cc
View file
Open in desktop
Expand Up @@ -37,7 +37,6 @@ BrowserWindow::BrowserWindow(gin::Arguments* args,
gin::Dictionary::CreateEmpty(isolate);
options.Get(options::kWebPreferences, &web_preferences);

v8::Local<v8::Value> value;
bool transparent = false;
options.Get(options::kTransparent, &transparent);

Expand All @@ -47,8 +46,9 @@ BrowserWindow::BrowserWindow(gin::Arguments* args,
#endif

// Copy the backgroundColor to webContents.
if (options.Get(options::kBackgroundColor, &value)) {
web_preferences.SetHidden(options::kBackgroundColor, value);
std::string color;
if (options.Get(options::kBackgroundColor, &color)) {
web_preferences.SetHidden(options::kBackgroundColor, color);
} else if (!vibrancy_type.empty() || transparent) {
// If the BrowserWindow is transparent or a vibrancy type has been set,
// also propagate transparency to the WebContents unless a separate
Expand Down Expand Up @@ -79,6 +79,7 @@ BrowserWindow::BrowserWindow(gin::Arguments* args,
}

// Copy the webContents option to webPreferences.
v8::Local<v8::Value> value;
if (options.Get("webContents", &value)) {
web_preferences.SetHidden("webContents", value);
}
Expand Down