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

fix: apply transparency settings to WebContentsPreferences (#31685)

Browse source 
* fix: add transparency to web_contents_preferences

* fix: correctly apply transparency settings to new webContents from webPreferences
This commit is contained in:
Keeley Hammond 2021-11-03 11:16:18 -07:00 • committed by GitHub
parent 190dd31dbc
commit 86f6285299
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -4059,9 +4059,11 @@ gin::Handle<WebContents> WebContents::CreateFromWebPreferences(
absl::optional<SkColor> color = absl::optional<SkColor> color =
existing_preferences->GetBackgroundColor(); existing_preferences->GetBackgroundColor();
web_contents->web_contents()->SetPageBaseBackgroundColor(color); web_contents->web_contents()->SetPageBaseBackgroundColor(color);
// Because web preferences don't recognize transparency,
// only set rwhv background color if a color exists
auto* rwhv = web_contents->web_contents()->GetRenderWidgetHostView(); auto* rwhv = web_contents->web_contents()->GetRenderWidgetHostView();
if (rwhv) if (rwhv && color.has_value())
rwhv->SetBackgroundColor(color.value_or(SK_ColorWHITE)); rwhv->SetBackgroundColor(color.value());
} }
} else { } else {
// Create one if not. // Create one if not.

6
shell/browser/web_contents_preferences.cc
View file

@ -225,6 +225,12 @@ void WebContentsPreferences::SetFromDictionary(
web_preferences.Get("disablePopups", &disable_popups_); web_preferences.Get("disablePopups", &disable_popups_);
web_preferences.Get("disableDialogs", &disable_dialogs_); web_preferences.Get("disableDialogs", &disable_dialogs_);
web_preferences.Get("safeDialogs", &safe_dialogs_); web_preferences.Get("safeDialogs", &safe_dialogs_);
// preferences don't save a transparency option,
// apply any existing transparency setting to background_color_
bool transparent;
if (web_preferences.Get(options::kTransparent, &transparent)) {
background_color_ = SK_ColorTRANSPARENT;
}
std::string background_color; std::string background_color;
if (web_preferences.GetHidden(options::kBackgroundColor, &background_color)) if (web_preferences.GetHidden(options::kBackgroundColor, &background_color))
background_color_ = ParseHexColor(background_color); background_color_ = ParseHexColor(background_color);