|
@@ -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(
|