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

fix: vibrancy window border (#46648)

Browse source 
* fix: vibrancy window border

* Use WidgetDelegate::OnWidgetInitialized instead
This commit is contained in:
Calvin 2025-04-25 03:42:48 -06:00 • committed by GitHub
parent 08318dc05d
commit 51dbe69e45
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 23 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
shell/browser/native_window_mac.h
View file

@ -225,6 +225,7 @@ class NativeWindowMac : public NativeWindow,
bool CanMaximize() const override; bool CanMaximize() const override;
std::unique_ptr<views::NonClientFrameView> CreateNonClientFrameView( std::unique_ptr<views::NonClientFrameView> CreateNonClientFrameView(
views::Widget* widget) override; views::Widget* widget) override;
void OnWidgetInitialized() override;
// ui::NativeThemeObserver: // ui::NativeThemeObserver:
void OnNativeThemeUpdated(ui::NativeTheme* observed_theme) override; void OnNativeThemeUpdated(ui::NativeTheme* observed_theme) override;

22
shell/browser/native_window_mac.mm
View file

@ -1862,6 +1862,28 @@ std::optional<gfx::Rect> NativeWindowMac::GetWindowControlsOverlayRect() {
return std::nullopt; return std::nullopt;
} }
void NativeWindowMac::OnWidgetInitialized() {
// |window_| is not yet assigned when this function is called, so we need to
// get the window from the widget.
NSWindow* window = widget()->GetNativeWindow().GetNativeNSWindow();
// In |NativeWidgetNSWindowBridge::InitCompositorView| in Chromium,
// translucent windows are assigned a clear background color. This causes
// undesirable side effects, such as a window with vibrancy losing its natural
// system border highlight. We undo that behavior here.
//
// Ref:
// https://source.chromium.org/chromium/chromium/src/+/main:components/remote_cocoa/app_shim/native_widget_ns_window_bridge.mm;l=1341-1342;drc=e7c8be576285195257b0813326b3bab154dc7e73
if (!transparent()) {
if ([[window backgroundColor] isEqual:NSColor.clearColor]) {
[window setBackgroundColor:NSColor.windowBackgroundColor];
}
if (![window isOpaque]) {
[window setOpaque:YES];
}
}
}
// static // static
std::unique_ptr<NativeWindow> NativeWindow::Create( std::unique_ptr<NativeWindow> NativeWindow::Create(
const gin_helper::Dictionary& options, const gin_helper::Dictionary& options,