From 3fb695589ee812eb8221a72dcdc55cb75e0ca71d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20Dj=C3=A4rv?= Date: Sat, 22 Jan 2011 12:33:32 +0100 Subject: [PATCH] * nsterm.m (constrainFrameRect): Only constrain the first time called. --- src/ChangeLog | 4 ++++ src/nsterm.m | 4 +--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 2377cb6d9cd..fcf8218d670 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2011-01-22 Jan Djärv + + * nsterm.m (constrainFrameRect): Only constrain the first time called. + 2011-01-21 Jan Djärv * nsterm.m (x_set_offset, windowDidMove): When calculating y, use first diff --git a/src/nsterm.m b/src/nsterm.m index da438296fff..1d86b3ec866 100644 --- 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; -- 2.39.5