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.
This commit is contained in:
parent
820739bbb5
commit
00e4e3e9d2
1 changed files with 6 additions and 5 deletions
11
src/nsterm.m
11
src/nsterm.m
|
@ -6824,9 +6824,10 @@ - (void) updateFrameSize: (BOOL) delay
|
|||
|
||||
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 @@ - (instancetype) initFrameFromEmacs: (struct frame *)f
|
|||
|
||||
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
|
||||
|
|
Loading…
Add table
Reference in a new issue