[Emacs-diffs] /srv/bzr/emacs/trunk r112059: * nsterm.m (updateFrameSize:): Change resize increments if needed.

[Jan D.]

------------------------------------------------------------
revno: 112059
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Sat 2013-03-16 15:15:42 +0100
message:
  * nsterm.m (updateFrameSize:): Change resize increments if needed.
modified:
  src/ChangeLog
  src/nsterm.m

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-03-16 13:52:12 +0000
+++ b/src/ChangeLog     2013-03-16 14:15:42 +0000
@@ -1,5 +1,7 @@
 2013-03-16  Jan Djärv  <address@hidden>
 
+       * nsterm.m (updateFrameSize:): Change resize increments if needed.
+
        * nsterm.h (EmacsSavePanel, EmacsOpenPanel): Add getFilename
        and getDirectory.
 

=== modified file 'src/nsterm.m'
--- a/src/nsterm.m      2013-02-05 12:16:35 +0000
+++ b/src/nsterm.m      2013-03-16 14:15:42 +0000
@@ -5448,12 +5448,26 @@
 
   if (oldr != rows || oldc != cols || neww != oldw || newh != oldh)
     {
+      struct frame *f = emacsframe;
       NSView *view = FRAME_NS_VIEW (emacsframe);
+      NSWindow *win = [view window];
+      NSSize sz = [win resizeIncrements];
+
       FRAME_PIXEL_WIDTH (emacsframe) = neww;
       FRAME_PIXEL_HEIGHT (emacsframe) = newh;
       change_frame_size (emacsframe, rows, cols, 0, delay, 0);
       SET_FRAME_GARBAGED (emacsframe);
       cancel_mouse_face (emacsframe);
+
+      // Did resize increments change because of a font change?
+      if (sz.width != FRAME_COLUMN_WIDTH (emacsframe) ||
+          sz.height != FRAME_LINE_HEIGHT (emacsframe))
+        {
+          sz.width = FRAME_COLUMN_WIDTH (emacsframe);
+          sz.height = FRAME_LINE_HEIGHT (emacsframe);
+          [win setResizeIncrements: sz];
+        }
+
       [view setFrame: NSMakeRect (0, 0, neww, newh)];
       [self windowDidMove:nil];   // Update top/left.
     }