procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* nsterm.m (toggleFullScreen:): Hide menubar on secondary monitor

Browse source 
for OSX >= 10.9 if separate spaces are used.
(toggleFullScreen:): Use screen of w instead of fw.

Fixes: debbugs:16659
This commit is contained in:
Jan Djärv 2014-02-06 08:57:53 +01:00
parent cf8a1938e3
commit 029788c7e2
2 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/ChangeLog
View file

@ -1,3 +1,9 @@
2014-02-06 Jan Djärv <jan.h.d@swipnet.se>
* nsterm.m (toggleFullScreen:): Hide menubar on secondary monitor
for OSX >= 10.9 if separate spaces are used.
(toggleFullScreen:): Use screen of w instead of fw (Bug#16659).
2014-02-06 Glenn Morris <rgm@gnu.org>
* buffer.c (cache-long-scans): Doc fix.

12
src/nsterm.m
View file

@ -6396,6 +6396,14 @@ - (void)toggleFullScreen: (id)sender
if (fs_state != FULLSCREEN_BOTH)
{
NSScreen *screen = [w screen];
#if defined (NS_IMPL_COCOA) && \
MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_9
/* Hide ghost menu bar on secondary monitor? */
if (! onFirstScreen)
onFirstScreen = [NSScreen screensHaveSeparateSpaces];
#endif
/* Hide dock and menubar if we are on the primary screen. */
if (onFirstScreen)
{
@ -6416,7 +6424,7 @@ - (void)toggleFullScreen: (id)sender
styleMask:NSBorderlessWindowMask
backing:NSBackingStoreBuffered
defer:YES
screen:[w screen]];
screen:screen];
[fw setContentView:[w contentView]];
[fw setTitle:[w title]];
@ -6439,7 +6447,7 @@ - (void)toggleFullScreen: (id)sender
[fw makeKeyAndOrderFront:NSApp];
[fw makeFirstResponder:self];
[w orderOut:self];
r = [fw frameRectForContentRect:[[fw screen] frame]];
r = [fw frameRectForContentRect:[screen frame]];
[fw setFrame: r display:YES animate:YES];
[self windowDidEnterFullScreen:nil];
[fw display];