Commit 3fb69558 authored by Jan Djärv's avatar Jan Djärv
Browse files

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

parent e02ea74b
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> 2011-01-21 Jan Djärv <jan.h.d@swipnet.se>
   
* nsterm.m (x_set_offset, windowDidMove): When calculating y, use first * nsterm.m (x_set_offset, windowDidMove): When calculating y, use first
...@@ -5063,7 +5063,6 @@ - (void)windowDidBecomeKey: (NSNotification *)notification ...@@ -5063,7 +5063,6 @@ - (void)windowDidBecomeKey: (NSNotification *)notification
NSTRACE (windowDidBecomeKey); NSTRACE (windowDidBecomeKey);
emacsframe->output_data.ns->dont_constrain = 1;
if (emacsframe != old_focus) if (emacsframe != old_focus)
dpyinfo->x_focus_frame = emacsframe; dpyinfo->x_focus_frame = emacsframe;
...@@ -5678,6 +5677,7 @@ - (NSRect)constrainFrameRect:(NSRect)frameRect toScreen:(NSScreen *)screen ...@@ -5678,6 +5677,7 @@ - (NSRect)constrainFrameRect:(NSRect)frameRect toScreen:(NSScreen *)screen
if (f->output_data.ns->dont_constrain) if (f->output_data.ns->dont_constrain)
return frameRect; return frameRect;
f->output_data.ns->dont_constrain = 1;
return [super constrainFrameRect:frameRect toScreen:screen]; return [super constrainFrameRect:frameRect toScreen:screen];
} }
...@@ -5685,8 +5685,6 @@ - (NSRect)constrainFrameRect:(NSRect)frameRect toScreen:(NSScreen *)screen ...@@ -5685,8 +5685,6 @@ - (NSRect)constrainFrameRect:(NSRect)frameRect toScreen:(NSScreen *)screen
/* called only on resize clicks by special case in EmacsApp-sendEvent */ /* called only on resize clicks by special case in EmacsApp-sendEvent */
- (void)mouseDown: (NSEvent *)theEvent - (void)mouseDown: (NSEvent *)theEvent
{ {
struct frame *f = ((EmacsView *)[self delegate])->emacsframe;
f->output_data.ns->dont_constrain = 1;
if (ns_in_resize) if (ns_in_resize)
{ {
NSSize size = [[theEvent window] frame].size; NSSize size = [[theEvent window] frame].size;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment