[Emacs-diffs] /srv/bzr/emacs/trunk r102938: * nsterm.m (constrainFrameRect): Only constrain the first time called.

[Jan D.]

------------------------------------------------------------
revno: 102938
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Sat 2011-01-22 12:33:32 +0100
message:
  * nsterm.m (constrainFrameRect): Only constrain the first time called.
modified:
  src/ChangeLog
  src/nsterm.m

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-01-21 14:19:44 +0000
+++ b/src/ChangeLog     2011-01-22 11:33:32 +0000
@@ -1,3 +1,7 @@
+2011-01-22  Jan Djärv  <address@hidden>
+
+       * nsterm.m (constrainFrameRect): Only constrain the first time called.
+
 2011-01-21  Jan Djärv  <address@hidden>
 
        * nsterm.m (x_set_offset, windowDidMove): When calculating y, use first

=== modified file 'src/nsterm.m'
--- a/src/nsterm.m      2011-01-21 14:19:44 +0000
+++ b/src/nsterm.m      2011-01-22 11:33:32 +0000
@@ -5063,7 +5063,6 @@
 
   NSTRACE (windowDidBecomeKey);
 
-  emacsframe->output_data.ns->dont_constrain = 1;
   if (emacsframe != old_focus)
     dpyinfo->x_focus_frame = emacsframe;
 
@@ -5678,6 +5677,7 @@
   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 @@
 /* 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;