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

* nsterm.m (updateFrameSize:, initFrameFromEmacs:)

(toggleFullScreen:): Take frame_resize_pixelwise into account when
setting resize increments.

Fixes: debbugs:18435
parent 1acb1bef
2014-09-09 Jan Djärv <jan.h.d@swipnet.se>
* nsterm.m (updateFrameSize:, initFrameFromEmacs:)
(toggleFullScreen:): Take frame_resize_pixelwise into account when
setting resize increments (Bug#18435).
2014-09-09 Eli Zaretskii <eliz@gnu.org>
* xdisp.c (pos_visible_p): Properly save and restore the iterator
......
......@@ -5821,10 +5821,13 @@ - (void) updateFrameSize: (BOOL) delay;
// 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 @@ - (BOOL)isOpaque
[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 @@ - (void)toggleFullScreen: (id)sender
(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)
{
......
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