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

Fix undecorated frame resizing issues on NS (bug#28512)

Browse source 
* src/nsterm.m (EmacsView::updateFrameSize): Don't wait for the
toolbar on undecorated frames.
(EmacsView::initFrameFromEmacs): Group window flags correctly.
This commit is contained in:
Alan Third 2017-09-23 19:43:58 +01:00
parent 820739bbb5
commit 00e4e3e9d2
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/nsterm.m
View file

@ -6824,9 +6824,10 @@ - (void) updateFrameSize: (BOOL) delay
if (wait_for_tool_bar) if (wait_for_tool_bar)
{ {
/* The toolbar height is always 0 in fullscreen, so don't wait /* The toolbar height is always 0 in fullscreen and undecorated
for it to become available. */ frames, so don't wait for it to become available. */
if (FRAME_TOOLBAR_HEIGHT (emacsframe) == 0 if (FRAME_TOOLBAR_HEIGHT (emacsframe) == 0
&& FRAME_UNDECORATED (emacsframe) == false
&& ! [self isFullscreen]) && ! [self isFullscreen])
{ {
NSTRACE_MSG ("Waiting for toolbar"); NSTRACE_MSG ("Waiting for toolbar");
@ -7207,9 +7208,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 #ifdef NS_IMPL_COCOA
| NSWindowStyleMaskResizable | NSWindowStyleMaskResizable
| NSWindowStyleMaskMiniaturizable | NSWindowStyleMaskMiniaturizable