procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove resizable attribute on macOS undecorated frames (bug#28512)

Browse source 
* src/nsterm.m (FRAME_DECORATED_FLAGS): Remove Cocoa specific #define.
(initFrameFromEmacs): Remove Cocoa specific window style attributes.
This commit is contained in:
Alan Third 2017-10-17 10:51:03 +01:00
parent b970a4a52a
commit dc8812829b
1 changed files with 4 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/nsterm.m
View file

@ -423,20 +423,12 @@ - (NSColor *)colorUsingDefaultColorSpace
} }
/* GNUstep always shows decorations if the window is resizable, /* These flags will be OR'd or XOR'd with the NSWindow's styleMask
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
property depending on what we're doing. */ property depending on what we're doing. */
#ifdef NS_IMPL_COCOA
#define FRAME_DECORATED_FLAGS NSWindowStyleMaskTitled
#else
#define FRAME_DECORATED_FLAGS (NSWindowStyleMaskTitled \ #define FRAME_DECORATED_FLAGS (NSWindowStyleMaskTitled \
| NSWindowStyleMaskResizable \ | NSWindowStyleMaskResizable \
| NSWindowStyleMaskMiniaturizable \ | NSWindowStyleMaskMiniaturizable \
| NSWindowStyleMaskClosable) | NSWindowStyleMaskClosable)
#endif
#define FRAME_UNDECORATED_FLAGS NSWindowStyleMaskBorderless #define FRAME_UNDECORATED_FLAGS NSWindowStyleMaskBorderless
/* TODO: get rid of need for these forward declarations */ /* TODO: get rid of need for these forward declarations */
@ -7211,15 +7203,9 @@ - (instancetype) initFrameFromEmacs: (struct frame *)f
win = [[EmacsWindow alloc] win = [[EmacsWindow alloc]
initWithContentRect: r initWithContentRect: r
styleMask: ((FRAME_UNDECORATED (f) styleMask: (FRAME_UNDECORATED (f)
? FRAME_UNDECORATED_FLAGS ? FRAME_UNDECORATED_FLAGS
: FRAME_DECORATED_FLAGS) : FRAME_DECORATED_FLAGS)
#ifdef NS_IMPL_COCOA
| NSWindowStyleMaskResizable
| NSWindowStyleMaskMiniaturizable
| NSWindowStyleMaskClosable
#endif
)
backing: NSBackingStoreBuffered backing: NSBackingStoreBuffered
defer: YES]; defer: YES];