summaryrefslogtreecommitdiff
path: root/src/nsterm.m
diff options
context:
space:
mode:
authorAlan Third <alan@idiocy.org>2017-10-17 10:51:03 +0100
committerAlan Third <alan@idiocy.org>2017-10-18 09:25:33 +0100
commitdc8812829b81540d385eaa5577fa31397a8181d3 (patch)
treeee177c28644a4841ef13b85f8b1b0dc278e59774 /src/nsterm.m
parentb970a4a52a1c04afce4916ca2bf337e2b36d26c4 (diff)
downloademacs-dc8812829b81540d385eaa5577fa31397a8181d3.tar.gz
emacs-dc8812829b81540d385eaa5577fa31397a8181d3.tar.bz2
emacs-dc8812829b81540d385eaa5577fa31397a8181d3.zip
Remove resizable attribute on macOS undecorated frames (bug#28512)
* src/nsterm.m (FRAME_DECORATED_FLAGS): Remove Cocoa specific #define. (initFrameFromEmacs): Remove Cocoa specific window style attributes.
Diffstat (limited to 'src/nsterm.m')
-rw-r--r--src/nsterm.m22
1 files changed, 4 insertions, 18 deletions
diff --git a/src/nsterm.m b/src/nsterm.m
index 0b43c04c0b7..709e905ec8f 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -423,20 +423,12 @@ static CGPoint menu_mouse_point;
}
-/* GNUstep always shows decorations if the window is resizable,
- miniaturizable or closable, but Cocoa does strange things in native
- fullscreen mode if you don't have at least resizable enabled.
-
- These flags will be OR'd or XOR'd with the NSWindow's styleMask
+/* These flags will be OR'd or XOR'd with the NSWindow's styleMask
property depending on what we're doing. */
-#ifdef NS_IMPL_COCOA
-#define FRAME_DECORATED_FLAGS NSWindowStyleMaskTitled
-#else
#define FRAME_DECORATED_FLAGS (NSWindowStyleMaskTitled \
| NSWindowStyleMaskResizable \
| NSWindowStyleMaskMiniaturizable \
| NSWindowStyleMaskClosable)
-#endif
#define FRAME_UNDECORATED_FLAGS NSWindowStyleMaskBorderless
/* TODO: get rid of need for these forward declarations */
@@ -7211,15 +7203,9 @@ not_in_argv (NSString *arg)
win = [[EmacsWindow alloc]
initWithContentRect: r
- styleMask: ((FRAME_UNDECORATED (f)
- ? FRAME_UNDECORATED_FLAGS
- : FRAME_DECORATED_FLAGS)
-#ifdef NS_IMPL_COCOA
- | NSWindowStyleMaskResizable
- | NSWindowStyleMaskMiniaturizable
- | NSWindowStyleMaskClosable
-#endif
- )
+ styleMask: (FRAME_UNDECORATED (f)
+ ? FRAME_UNDECORATED_FLAGS
+ : FRAME_DECORATED_FLAGS)
backing: NSBackingStoreBuffered
defer: YES];