[Emacs-diffs] trunk r116287: * nsterm.m (toggleFullScreen:): Hide menubar on secondary monitor

[Jan D.]

------------------------------------------------------------
revno: 116287
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/16659
committer: Jan Djärv <address@hidden>
branch nick: trunk
timestamp: Thu 2014-02-06 08:57:53 +0100
message:
  * 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.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/nsterm.m                   nsterm.m-20091113204419-o5vbwnq5f7feedwu-8747

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-02-06 04:27:26 +0000
+++ b/src/ChangeLog     2014-02-06 07:57:53 +0000
@@ -1,3 +1,9 @@
+2014-02-06  Jan Djärv  <address@hidden>
+
+       * 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  <address@hidden>
 
        * buffer.c (cache-long-scans): Doc fix.

=== modified file 'src/nsterm.m'
--- a/src/nsterm.m      2014-01-20 19:44:56 +0000
+++ b/src/nsterm.m      2014-02-06 07:57:53 +0000
@@ -6396,6 +6396,14 @@
 
   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 @@
                                  styleMask:NSBorderlessWindowMask
                                    backing:NSBackingStoreBuffered
                                      defer:YES
-                                    screen:[w screen]];
+                                    screen:screen];
 
       [fw setContentView:[w contentView]];
       [fw setTitle:[w title]];
@@ -6439,7 +6447,7 @@
       [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];