[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 517a039: Don't wait for toolbar in NS native fullsc
From: |
Alan Third |
Subject: |
[Emacs-diffs] master 517a039: Don't wait for toolbar in NS native fullscreen |
Date: |
Sat, 10 Jun 2017 18:22:18 -0400 (EDT) |
branch: master
commit 517a0394d2ba15b517e2a2b7384a7cc98b11b80d
Author: Alan Third <address@hidden>
Commit: Alan Third <address@hidden>
Don't wait for toolbar in NS native fullscreen
* src/nsterm.m (EmacsView:updateFrameSize): Don't short-circuit the
function when in fullscreen.
---
src/nsterm.m | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/nsterm.m b/src/nsterm.m
index e69aa43..633ca3b 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -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;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 517a039: Don't wait for toolbar in NS native fullscreen,
Alan Third <=