diff options
| author | Alan Third | 2017-10-17 10:51:03 +0100 |
|---|---|---|
| committer | Alan Third | 2017-10-18 09:25:33 +0100 |
| commit | dc8812829b81540d385eaa5577fa31397a8181d3 (patch) | |
| tree | ee177c28644a4841ef13b85f8b1b0dc278e59774 /src | |
| parent | b970a4a52a1c04afce4916ca2bf337e2b36d26c4 (diff) | |
| download | emacs-dc8812829b81540d385eaa5577fa31397a8181d3.tar.gz 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')
| -rw-r--r-- | src/nsterm.m | 22 |
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; | |||
| 423 | } | 423 | } |
| 424 | 424 | ||
| 425 | 425 | ||
| 426 | /* GNUstep always shows decorations if the window is resizable, | 426 | /* These flags will be OR'd or XOR'd with the NSWindow's styleMask |
| 427 | miniaturizable or closable, but Cocoa does strange things in native | ||
| 428 | fullscreen mode if you don't have at least resizable enabled. | ||
| 429 | |||
| 430 | These flags will be OR'd or XOR'd with the NSWindow's styleMask | ||
| 431 | property depending on what we're doing. */ | 427 | property depending on what we're doing. */ |
| 432 | #ifdef NS_IMPL_COCOA | ||
| 433 | #define FRAME_DECORATED_FLAGS NSWindowStyleMaskTitled | ||
| 434 | #else | ||
| 435 | #define FRAME_DECORATED_FLAGS (NSWindowStyleMaskTitled \ | 428 | #define FRAME_DECORATED_FLAGS (NSWindowStyleMaskTitled \ |
| 436 | | NSWindowStyleMaskResizable \ | 429 | | NSWindowStyleMaskResizable \ |
| 437 | | NSWindowStyleMaskMiniaturizable \ | 430 | | NSWindowStyleMaskMiniaturizable \ |
| 438 | | NSWindowStyleMaskClosable) | 431 | | NSWindowStyleMaskClosable) |
| 439 | #endif | ||
| 440 | #define FRAME_UNDECORATED_FLAGS NSWindowStyleMaskBorderless | 432 | #define FRAME_UNDECORATED_FLAGS NSWindowStyleMaskBorderless |
| 441 | 433 | ||
| 442 | /* TODO: get rid of need for these forward declarations */ | 434 | /* TODO: get rid of need for these forward declarations */ |
| @@ -7211,15 +7203,9 @@ not_in_argv (NSString *arg) | |||
| 7211 | 7203 | ||
| 7212 | win = [[EmacsWindow alloc] | 7204 | win = [[EmacsWindow alloc] |
| 7213 | initWithContentRect: r | 7205 | initWithContentRect: r |
| 7214 | styleMask: ((FRAME_UNDECORATED (f) | 7206 | styleMask: (FRAME_UNDECORATED (f) |
| 7215 | ? FRAME_UNDECORATED_FLAGS | 7207 | ? FRAME_UNDECORATED_FLAGS |
| 7216 | : FRAME_DECORATED_FLAGS) | 7208 | : FRAME_DECORATED_FLAGS) |
| 7217 | #ifdef NS_IMPL_COCOA | ||
| 7218 | | NSWindowStyleMaskResizable | ||
| 7219 | | NSWindowStyleMaskMiniaturizable | ||
| 7220 | | NSWindowStyleMaskClosable | ||
| 7221 | #endif | ||
| 7222 | ) | ||
| 7223 | backing: NSBackingStoreBuffered | 7209 | backing: NSBackingStoreBuffered |
| 7224 | defer: YES]; | 7210 | defer: YES]; |
| 7225 | 7211 | ||