Mercurial > emacs
changeset 112447:bcecab2ad22d
* nsterm.m (x_set_offset): Set dont_constrain to 0 so the call to
setFrameTopLeftPoint is constrained.
| author | Jan D. <jan.h.d@swipnet.se> |
|---|---|
| date | Sun, 23 Jan 2011 14:28:14 +0100 |
| parents | f60dc8d74215 |
| children | 9e4388bac77b 16ddab338c43 |
| files | src/ChangeLog src/nsterm.m |
| diffstat | 2 files changed, 10 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Sun Jan 23 11:21:04 2011 +0000 +++ b/src/ChangeLog Sun Jan 23 14:28:14 2011 +0100 @@ -1,3 +1,8 @@ +2011-01-23 Jan Djärv <jan.h.d@swipnet.se> + + * nsterm.m (x_set_offset): Set dont_constrain to 0 so the call to + setFrameTopLeftPoint is constrained. + 2011-01-23 Paul Eggert <eggert@cs.ucla.edu> Check return values of some library calls.
--- a/src/nsterm.m Sun Jan 23 11:21:04 2011 +0000 +++ b/src/nsterm.m Sun Jan 23 14:28:14 2011 +0100 @@ -1071,8 +1071,8 @@ ? [screen visibleFrame].size.width + f->left_pos - FRAME_PIXEL_WIDTH (f) : f->left_pos; /* We use visibleFrame here to take menu bar into account. - Ideally we should also adjust left/top with visibleFrame.offset. */ - + Ideally we should also adjust left/top with visibleFrame.origin. */ + f->top_pos = f->size_hint_flags & YNegative ? ([screen visibleFrame].size.height + f->top_pos - FRAME_PIXEL_HEIGHT (f) - FRAME_NS_TITLEBAR_HEIGHT (f) @@ -1082,6 +1082,9 @@ if (f->left_pos < 100) f->left_pos = 100; /* don't overlap menu */ #endif + /* Constrain the setFrameTopLeftPoint so we don't move behind the + menu bar. */ + f->output_data.ns->dont_constrain = 0; [[view window] setFrameTopLeftPoint: NSMakePoint (SCREENMAXBOUND (f->left_pos), SCREENMAXBOUND ([fscreen frame].size.height