Mercurial > emacs
changeset 112414:4b27e6d58d2c
* nsterm.m (constrainFrameRect): Only constrain the first time called.
| author | Jan D. <jan.h.d@swipnet.se> |
|---|---|
| date | Sat, 22 Jan 2011 12:33:32 +0100 |
| parents | 8f3d1f1cc05d |
| children | 555faf6e40d0 |
| files | src/ChangeLog src/nsterm.m |
| diffstat | 2 files changed, 5 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Fri Jan 21 23:19:54 2011 -0800 +++ b/src/ChangeLog Sat Jan 22 12:33:32 2011 +0100 @@ -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
--- a/src/nsterm.m Fri Jan 21 23:19:54 2011 -0800 +++ b/src/nsterm.m Sat Jan 22 12:33:32 2011 +0100 @@ -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;