mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-28 16:21:07 -08:00
Code Issues Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Jan Djärv 2011-01-22 12:33:32 +01:00
parent e02ea74b7e
commit 3fb695589e
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/ChangeLog
View file

@ -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

4
src/nsterm.m
View file

@ -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;