From 00e4e3e9d273a193620c3a4bb4914e555cb8e343 Mon Sep 17 00:00:00 2001 From: Alan Third Date: Sat, 23 Sep 2017 19:43:58 +0100 Subject: [PATCH] Fix undecorated frame resizing issues on NS (bug#28512) * src/nsterm.m (EmacsView::updateFrameSize): Don't wait for the toolbar on undecorated frames. (EmacsView::initFrameFromEmacs): Group window flags correctly. --- src/nsterm.m | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/nsterm.m b/src/nsterm.m index a41d6be2045..fb3ebc963e7 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -6824,9 +6824,10 @@ not_in_argv (NSString *arg) if (wait_for_tool_bar) { - /* The toolbar height is always 0 in fullscreen, so don't wait - for it to become available. */ + /* The toolbar height is always 0 in fullscreen and undecorated + frames, so don't wait for it to become available. */ if (FRAME_TOOLBAR_HEIGHT (emacsframe) == 0 + && FRAME_UNDECORATED (emacsframe) == false && ! [self isFullscreen]) { NSTRACE_MSG ("Waiting for toolbar"); @@ -7207,9 +7208,9 @@ not_in_argv (NSString *arg) win = [[EmacsWindow alloc] initWithContentRect: r - styleMask: (FRAME_UNDECORATED (f) - ? FRAME_UNDECORATED_FLAGS - : FRAME_DECORATED_FLAGS + styleMask: ((FRAME_UNDECORATED (f) + ? FRAME_UNDECORATED_FLAGS + : FRAME_DECORATED_FLAGS) #ifdef NS_IMPL_COCOA | NSWindowStyleMaskResizable | NSWindowStyleMaskMiniaturizable -- 2.39.2