]> git.eshelyaron.com Git - emacs.git/commitdiff
Don't wait for toolbar in NS native fullscreen
authorAlan Third <alan@idiocy.org>
Sat, 10 Jun 2017 21:44:01 +0000 (22:44 +0100)
committerAlan Third <alan@idiocy.org>
Sat, 10 Jun 2017 21:49:45 +0000 (22:49 +0100)
* src/nsterm.m (EmacsView:updateFrameSize): Don't short-circuit the
function when in fullscreen.

src/nsterm.m

index e69aa43dd377ba1a3d655de5f6b9824283b30558..633ca3bf76bef5edc5c469a0bc30e1544ab38ec3 100644 (file)
@@ -6560,7 +6560,10 @@ not_in_argv (NSString *arg)
 
   if (wait_for_tool_bar)
     {
-      if (FRAME_TOOLBAR_HEIGHT (emacsframe) == 0)
+      /* The toolbar height is always 0 in fullscreen, so don't wait
+         for it to become available. */
+      if (FRAME_TOOLBAR_HEIGHT (emacsframe) == 0
+          && ! [self isFullscreen])
         {
           NSTRACE_MSG ("Waiting for toolbar");
           return;