[Emacs-diffs] /srv/bzr/emacs/trunk r102958: * nsterm.m (x_set_offset): Set dont_constrain to 0 so the call to

[Jan D.]

------------------------------------------------------------
revno: 102958
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Sun 2011-01-23 14:28:14 +0100
message:
  * nsterm.m (x_set_offset): Set dont_constrain to 0 so the call to
  setFrameTopLeftPoint is constrained.
modified:
  src/ChangeLog
  src/nsterm.m

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-01-23 07:32:08 +0000
+++ b/src/ChangeLog     2011-01-23 13:28:14 +0000
@@ -1,3 +1,8 @@
+2011-01-23  Jan Djärv  <address@hidden>
+
+       * nsterm.m (x_set_offset): Set dont_constrain to 0 so the call to
+       setFrameTopLeftPoint is constrained.
+
 2011-01-23  Paul Eggert  <address@hidden>
 
        Check return values of some library calls.

=== modified file 'src/nsterm.m'
--- a/src/nsterm.m      2011-01-22 11:33:32 +0000
+++ b/src/nsterm.m      2011-01-23 13:28:14 +0000
@@ -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