commit cf3ea44eb56364190ea9f2b905f74902c49de416 (HEAD, refs/remotes/origin/master) Author: Aaron Jensen Date: Fri Nov 22 18:17:55 2024 -0800 Silence warning message in NS (bug#59790) * src/nsterm.m ([EmacsWindow createToolbar:]): Disable toolbar when fullscreen. diff --git a/src/nsterm.m b/src/nsterm.m index dabc36ce018..205b1621399 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -9361,7 +9361,10 @@ - (instancetype) initWithEmacsFrame: (struct frame *) f - (void)createToolbar: (struct frame *)f { - if (FRAME_UNDECORATED (f) || !FRAME_EXTERNAL_TOOL_BAR (f) || [self toolbar] != nil) + if (FRAME_UNDECORATED (f) + || [self styleMask] == NSWindowStyleMaskBorderless + || !FRAME_EXTERNAL_TOOL_BAR (f) + || [self toolbar] != nil) return; EmacsView *view = (EmacsView *)FRAME_NS_VIEW (f); commit 20aa29b03739c496106f166ef84562c602b9ddb2 Author: Aaron Jensen Date: Sat Nov 16 20:32:41 2024 -0800 Remove NS non-native fullscreen pause (bug#28443) * src/nsterm.m (ns_fullscreen_hook): Remove timer workaround diff --git a/src/nsterm.m b/src/nsterm.m index 47ce20455c5..dabc36ce018 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -1984,16 +1984,6 @@ Hide the window (X11 semantics) if (!FRAME_VISIBLE_P (f)) return; - if (! [view fsIsNative] && f->want_fullscreen == FULLSCREEN_BOTH) - { - /* Old style fs don't initiate correctly if created from - init/default-frame alist, so use a timer (not nice...). */ - [NSTimer scheduledTimerWithTimeInterval: 0.5 target: view - selector: @selector (handleFS) - userInfo: nil repeats: NO]; - return; - } - block_input (); [view handleFS]; unblock_input ();