* nsterm.m (constrainFrameRect): Always constrain when there is only

one screen.

Fixes: debbugs:10962

diff --git a/src/ChangeLog b/src/ChangeLog
index af65d38a33b31c42fcab4deb1e53d825084c88e3..ef84324c9d93987f35f7f3ed16adda5d280bf888 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2012-04-09  Jan Djärv  <jan.h.d@swipnet.se>
+
+       * nsterm.m (constrainFrameRect): Always constrain when there is only
+       one screen (Bug#10962).
+
 2012-04-06  Eli Zaretskii  <eliz@gnu.org>
 
        * buffer.h (FETCH_CHAR, FETCH_MULTIBYTE_CHAR):

diff --git a/src/nsterm.m b/src/nsterm.m
index a45792fd6450b28a68c0c0184bb5d3f877f7d7eb..7cbaf9913111c40d77da7ec43b771ea14414e36f 100644 (file)
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -6038,11 +6038,15 @@ ns_term_shutdown (int sig)
    restrict the height to just one monitor.  So we override this.  */
 - (NSRect)constrainFrameRect:(NSRect)frameRect toScreen:(NSScreen *)screen
 {
-  /* When making the frame visible for the first time, we want to
-     constrain.  Other times not.  */
+  /* When making the frame visible for the first time or if there is just
+     one screen, we want to constrain.  Other times not.  */
+  NSUInteger nr_screens = [[NSScreen screens] count];
   struct frame *f = ((EmacsView *)[self delegate])->emacsframe;
   NSTRACE (constrainFrameRect);
 
+  if (nr_screens == 1)
+    return [super constrainFrameRect:frameRect toScreen:screen];
+  
   if (f->output_data.ns->dont_constrain
       || ns_menu_bar_should_be_hidden ())
     return frameRect;