diff options
| author | Alan Third | 2017-06-10 22:44:01 +0100 |
|---|---|---|
| committer | Alan Third | 2017-06-10 22:49:45 +0100 |
| commit | 517a0394d2ba15b517e2a2b7384a7cc98b11b80d (patch) | |
| tree | e728a6ca8542a9427c4bdfc33bd7b44f496692ab /src | |
| parent | b94472f18853c6075938cc5f9ac2856d7ad499b7 (diff) | |
| download | emacs-517a0394d2ba15b517e2a2b7384a7cc98b11b80d.tar.gz emacs-517a0394d2ba15b517e2a2b7384a7cc98b11b80d.zip | |
Don't wait for toolbar in NS native fullscreen
* src/nsterm.m (EmacsView:updateFrameSize): Don't short-circuit the
function when in fullscreen.
Diffstat (limited to 'src')
| -rw-r--r-- | src/nsterm.m | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/nsterm.m b/src/nsterm.m index e69aa43dd37..633ca3bf76b 100644 --- a/src/nsterm.m +++ b/src/nsterm.m | |||
| @@ -6560,7 +6560,10 @@ not_in_argv (NSString *arg) | |||
| 6560 | 6560 | ||
| 6561 | if (wait_for_tool_bar) | 6561 | if (wait_for_tool_bar) |
| 6562 | { | 6562 | { |
| 6563 | if (FRAME_TOOLBAR_HEIGHT (emacsframe) == 0) | 6563 | /* The toolbar height is always 0 in fullscreen, so don't wait |
| 6564 | for it to become available. */ | ||
| 6565 | if (FRAME_TOOLBAR_HEIGHT (emacsframe) == 0 | ||
| 6566 | && ! [self isFullscreen]) | ||
| 6564 | { | 6567 | { |
| 6565 | NSTRACE_MSG ("Waiting for toolbar"); | 6568 | NSTRACE_MSG ("Waiting for toolbar"); |
| 6566 | return; | 6569 | return; |