bug#50534: 28.0.50; Toolbar shows despite tool-bar-mode being disabled on macOS

[Alan Third <alan@idiocy.org>]

[-- Attachment #1: Type: text/plain, Size: 776 bytes --]

On Tue, Sep 14, 2021 at 01:26:44PM +0200, Kirill A. Korinsky wrote:
> I have one bad news: it still exists but less often.
> 
> I can reproduce it one time in 10 starts of my emacs.

The *only* place that should modify FRAME_EXTERNAL_TOOL_BAR is
ns_set_tool_bar_lines, which should be called *every time* the number
of lines is changed.

It would be nice to know what the value of FRAME_EXTERNAL_TOOL_BAR and
tool-bar-lines are when the toolbar is wrongly visible, because I
can't find a single location in the code that sets the visibility
without first checking FRAME_EXTERNAL_TOOL_BAR, and it should *always*
be set by ns_set_tool_bar_lines.

*sigh* I've no idea.

Attached is the nuclear option. If this doesn't work then
FRAME_EXTERNAL_TOOL_BAR is wrong.

-- 
Alan Third

[-- Attachment #2: 0001-A-further-fix-for-toolbar-visibility-problems-on-mac.patch --]
[-- Type: text/x-diff, Size: 1222 bytes --]

From 5a652de0e955185fafdad3b2aa886c0fdf48e679 Mon Sep 17 00:00:00 2001
From: Alan Third <alan@idiocy.org>
Date: Tue, 14 Sep 2021 13:03:37 +0100
Subject: [PATCH] A further fix for toolbar visibility problems on macOS
 (bug#50534)

* src/nsterm.m (ns_update_begin): Ensure the toolbar's visibility is
set correctly.
---
 src/nsterm.m | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/nsterm.m b/src/nsterm.m
index 33850544b0..14dc6573b8 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -1034,16 +1034,14 @@ static NSRect constrain_frame_rect(NSRect frameRect, bool isFullscreen)
 
   ns_update_auto_hide_menu_bar ();
 
-#ifdef NS_IMPL_COCOA
-  if ([view isFullscreen] && [view fsIsNative])
+  NSToolbar *toolbar = [[FRAME_NS_VIEW (f) window] toolbar];
+  if (toolbar)
   {
-    // Fix reappearing tool bar in fullscreen for Mac OS X 10.7
+    /* Ensure the toolbars visibility is set correctly.  */
     BOOL tbar_visible = FRAME_EXTERNAL_TOOL_BAR (f) ? YES : NO;
-    NSToolbar *toolbar = [[FRAME_NS_VIEW (f) window] toolbar];
     if (! tbar_visible != ! [toolbar isVisible])
       [toolbar setVisible: tbar_visible];
   }
-#endif
 
   ns_updating_frame = f;
   [view lockFocus];
-- 
2.30.2