From dc8812829b81540d385eaa5577fa31397a8181d3 Mon Sep 17 00:00:00 2001 From: Alan Third Date: Tue, 17 Oct 2017 10:51:03 +0100 Subject: [PATCH] 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. --- src/nsterm.m | 22 ++++------------------ 1 file 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]; -- 2.39.5