* nsterm.m (constrainFrameRect): Only constrain the first time called.

diff --git a/src/ChangeLog b/src/ChangeLog
index 2377cb6d9cd5c12f261710b87cda1055be7f0a52..fcf8218d67065f6998666355bfbb0fbbfe544adc 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2011-01-22  Jan Djärv  <jan.h.d@swipnet.se>
+
+       * nsterm.m (constrainFrameRect): Only constrain the first time called.
+
 2011-01-21  Jan Djärv  <jan.h.d@swipnet.se>
 
        * nsterm.m (x_set_offset, windowDidMove): When calculating y, use first

diff --git a/src/nsterm.m b/src/nsterm.m
index da438296fff85fcebc9170f2e1cde4b94923e434..1d86b3ec866c8a97e0ea61de1d621e81cb32e62a 100644 (file)
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -5063,7 +5063,6 @@ ns_term_shutdown (int sig)
 
   NSTRACE (windowDidBecomeKey);
 
-  emacsframe->output_data.ns->dont_constrain = 1;
   if (emacsframe != old_focus)
     dpyinfo->x_focus_frame = emacsframe;
 
@@ -5678,6 +5677,7 @@ ns_term_shutdown (int sig)
   if (f->output_data.ns->dont_constrain)
     return frameRect;
 
+  f->output_data.ns->dont_constrain = 1;
   return [super constrainFrameRect:frameRect toScreen:screen];
 }
 
@@ -5685,8 +5685,6 @@ ns_term_shutdown (int sig)
 /* called only on resize clicks by special case in EmacsApp-sendEvent */
 - (void)mouseDown: (NSEvent *)theEvent
 {
-  struct frame *f = ((EmacsView *)[self delegate])->emacsframe;
-  f->output_data.ns->dont_constrain = 1;
   if (ns_in_resize)
     {
       NSSize size = [[theEvent window] frame].size;