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: fix vibrancy applying without transparency on MacOS #40109

Merged
merged 2 commits into from
Oct 6, 2023
Merged

fix: fix vibrancy applying without transparency on MacOS #40109

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f8dfc19
fix: fix vibrancy applying without transparency
VerteDinde Oct 5, 2023
a241d95
fix: initiate backgroundMaterial and vibrancy earlier in native window
VerteDinde Oct 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions shell/browser/api/electron_api_browser_window.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,23 @@ BrowserWindow::BrowserWindow(gin::Arguments* args,
auto web_preferences = gin_helper::Dictionary::CreateEmpty(isolate);
options.Get(options::kWebPreferences, &web_preferences);

bool transparent = false;
options.Get(options::kTransparent, &transparent);

std::string vibrancy_type;
#if BUILDFLAG(IS_MAC)
options.Get(options::kVibrancyType, &vibrancy_type);
#endif

// Copy the backgroundColor to webContents.
std::string color;
if (options.Get(options::kBackgroundColor, &color)) {
web_preferences.SetHidden(options::kBackgroundColor, color);
#if BUILDFLAG(IS_WIN)
} else if (window_->IsTranslucent()) {
#else
} else if (!vibrancy_type.empty() || transparent) {
VerteDinde marked this conversation as resolved.
Show resolved Hide resolved
#endif
// If the BrowserWindow is transparent or a vibrancy type has been set,
// also propagate transparency to the WebContents unless a separate
// backgroundColor has been set.
Expand Down