From cbf9c5873056657865c5a149ece5122a8d03011a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rudolf=20Adamkovi=C4=8D?= Date: Wed, 26 Nov 2025 09:24:19 +0100 Subject: [PATCH] NS: Fix toolbar style and position * src/nsterm.m ([EmacsWindow initWithEmacsFrame:fullscreen:screen:]): Always show the toolbar below the window title. This is needed on Mac OS 11+ where the toolbar style is decided by the system (which is unpredictable) and the newfangled "compact" toolbar may be chosen (which is undesirable). (Bug#79900) --- src/nsterm.m | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/nsterm.m b/src/nsterm.m index 74ee1219bbc..200b006d6fa 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -9562,6 +9562,13 @@ ns_in_echo_area (void) #ifdef NS_IMPL_COCOA if ([self respondsToSelector:@selector(setTabbingMode:)]) [self setTabbingMode:NSWindowTabbingModeDisallowed]; +#endif + /* Always show the toolbar below the window title. This is needed + on Mac OS 11+ where the toolbar style is decided by the system + (which is unpredictable) and the newfangled "compact" toolbar + may be chosen (which is undesirable). */ +#ifdef NS_IMPL_COCOA + [self setToolbarStyle: NSWindowToolbarStyleExpanded]; #endif }