[Emacs-diffs] emacs-24 r117489: * nsterm.m (updateFrameSize:, initFrameFromEmacs:)

[Jan D.]

------------------------------------------------------------
revno: 117489
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/18435
committer: Jan D. <address@hidden>
branch nick: emacs-24
timestamp: Tue 2014-09-09 19:46:28 +0200
message:
  * nsterm.m (updateFrameSize:, initFrameFromEmacs:)
  (toggleFullScreen:): Take frame_resize_pixelwise into account when
  setting resize increments.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/nsterm.m                   nsterm.m-20091113204419-o5vbwnq5f7feedwu-8747

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-09-09 15:04:35 +0000
+++ b/src/ChangeLog     2014-09-09 17:46:28 +0000
@@ -1,3 +1,9 @@
+2014-09-09  Jan Djärv  <address@hidden>
+
+       * nsterm.m (updateFrameSize:, initFrameFromEmacs:)
+       (toggleFullScreen:): Take frame_resize_pixelwise into account when
+       setting resize increments (Bug#18435).
+
 2014-09-09  Eli Zaretskii  <address@hidden>
 
        * xdisp.c (pos_visible_p): Properly save and restore the iterator

=== modified file 'src/nsterm.m'
--- a/src/nsterm.m      2014-07-20 13:18:47 +0000
+++ b/src/nsterm.m      2014-09-09 17:46:28 +0000
@@ -5821,10 +5821,13 @@
 
       // Did resize increments change because of a font change?
       if (sz.width != FRAME_COLUMN_WIDTH (emacsframe) ||
-          sz.height != FRAME_LINE_HEIGHT (emacsframe))
+          sz.height != FRAME_LINE_HEIGHT (emacsframe) ||
+          (frame_resize_pixelwise && sz.width != 1))
         {
-          sz.width = FRAME_COLUMN_WIDTH (emacsframe);
-          sz.height = FRAME_LINE_HEIGHT (emacsframe);
+          sz.width = frame_resize_pixelwise
+            ? 1 : FRAME_COLUMN_WIDTH (emacsframe);
+          sz.height = frame_resize_pixelwise
+            ? 1 : FRAME_LINE_HEIGHT (emacsframe);
           [win setResizeIncrements: sz];
 
           NSTRACE_SIZE ("New size", NSMakeSize (neww, newh));
@@ -6086,8 +6089,8 @@
   [win setDelegate: self];
   [win useOptimizedDrawing: YES];
 
-  sz.width = FRAME_COLUMN_WIDTH (f);
-  sz.height = FRAME_LINE_HEIGHT (f);
+  sz.width = frame_resize_pixelwise ? 1 : FRAME_COLUMN_WIDTH (f);
+  sz.height = frame_resize_pixelwise ? 1 : FRAME_LINE_HEIGHT (f);
   [win setResizeIncrements: sz];
 
   [[win contentView] addSubview: self];
@@ -6434,8 +6437,8 @@
                                  (FRAME_DEFAULT_FACE (f)),
                                  f);
 
-  sz.width = FRAME_COLUMN_WIDTH (f);
-  sz.height = FRAME_LINE_HEIGHT (f);
+  sz.width = frame_resize_pixelwise ? 1 : FRAME_COLUMN_WIDTH (f);
+  sz.height = frame_resize_pixelwise ? 1 : FRAME_LINE_HEIGHT (f);
 
   if (fs_state != FULLSCREEN_BOTH)
     {