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

chore: fix textured window conditional on macOS (#44728)

Browse source
This commit is contained in:
Shelley Vohr 2024-11-20 17:34:46 +01:00 • committed by GitHub
parent eba0edf81e
commit f95e1d8ea0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 3 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

12
shell/browser/native_window_mac.mm
View file

@ -167,11 +167,6 @@ NativeWindowMac::NativeWindowMac(const gin_helper::Dictionary& options,
if (!rounded_corner && !has_frame())
styleMask = NSWindowStyleMaskBorderless;
// TODO: remove NSWindowStyleMaskTexturedBackground.
// https://github.com/electron/electron/issues/43125
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
if (minimizable)
styleMask |= NSWindowStyleMaskMiniaturizable;
if (closable)
@ -179,9 +174,11 @@ NativeWindowMac::NativeWindowMac(const gin_helper::Dictionary& options,
if (resizable)
styleMask |= NSWindowStyleMaskResizable;
// TODO: remove NSWindowStyleMaskTexturedBackground.
// https://github.com/electron/electron/issues/43125
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
if (windowType == "textured" || transparent() || !has_frame()) {
if (windowType == "textured" && (transparent() || !has_frame())) {
util::EmitWarning(
"The 'textured' window type is deprecated and will be removed",
"DeprecationWarning");
@ -189,9 +186,6 @@ NativeWindowMac::NativeWindowMac(const gin_helper::Dictionary& options,
}
#pragma clang diagnostic pop
// -Wdeprecated-declarations
#pragma clang diagnostic pop
// Create views::Widget and assign window_ with it.
// TODO(zcbenz): Get rid of the window_ in future.
views::Widget::InitParams params(