From: Alan Third <alan@idiocy.org>
Date: Mon, 13 Sep 2021 19:09:22 +0000 (+0100)
Subject: Fix incorrectly appearing toolbar on NS (bug#50534)
X-Git-Tag: emacs-28.0.90~985
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1e83d04214f27a79a4d4841772da946e24cbf21d;p=emacs.git

Fix incorrectly appearing toolbar on NS (bug#50534)

* src/nsmenu.m (update_frame_tool_bar): Ensure both sides of the test
are booleans.
* src/nsterm.m ([EmacsWindow createToolbar:]): Make the toolbar
non-visible initially, in case things get out of sync.  Remove call to
update_frame_tool_bar: the window isn't yet associated with the view,
so it will return immediately.
---

diff --git a/src/nsmenu.m b/src/nsmenu.m
index 3493e4e131d..f0c5bb24e63 100644
--- a/src/nsmenu.m
+++ b/src/nsmenu.m
@@ -1094,7 +1094,7 @@ update_frame_tool_bar (struct frame *f)
 #undef TOOLPROP
     }
 
-  if ([toolbar isVisible] != FRAME_EXTERNAL_TOOL_BAR (f))
+  if (![toolbar isVisible] != !FRAME_EXTERNAL_TOOL_BAR (f))
     {
       f->output_data.ns->in_animation = 1;
       [toolbar setVisible: FRAME_EXTERNAL_TOOL_BAR (f)];
diff --git a/src/nsterm.m b/src/nsterm.m
index 8d88f7bd3de..7c90bbd5787 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -8323,10 +8323,9 @@ not_in_argv (NSString *arg)
   EmacsToolbar *toolbar = [[EmacsToolbar alloc]
                             initForView:view
                             withIdentifier:[NSString stringWithLispString:f->name]];
+  [toolbar setVisible:NO];
   [self setToolbar:toolbar];
 
-  update_frame_tool_bar (f);
-
 #ifdef NS_IMPL_COCOA
   {
     NSButton *toggleButton;