aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAnders Lindgren2015-09-21 09:01:18 +0200
committerMartin Rudalics2015-09-21 09:01:18 +0200
commit18028318d8908d547d82e8e3159994c14bb47dce (patch)
treeccd2eccc0792163a46c85031cdb7a4cd350070d7 /src
parent57d48c364cf24c9f99f3d03eb74d9d2a81f4ae31 (diff)
downloademacs-18028318d8908d547d82e8e3159994c14bb47dce.tar.gz
emacs-18028318d8908d547d82e8e3159994c14bb47dce.zip
Keep upper edge unchanged when changing size of NS frame (Bug#21415)
* src/nsterm.m (x_set_window_size): Keep upper frame edge unchanged (Bug#21415).
Diffstat (limited to 'src')
-rw-r--r--src/nsterm.m3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/nsterm.m b/src/nsterm.m
index 2806f31155d..14f2beb4489 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -1333,6 +1333,7 @@ x_set_window_size (struct frame *f,
1333 int tb = FRAME_EXTERNAL_TOOL_BAR (f); 1333 int tb = FRAME_EXTERNAL_TOOL_BAR (f);
1334 int pixelwidth, pixelheight; 1334 int pixelwidth, pixelheight;
1335 int rows, cols; 1335 int rows, cols;
1336 int orig_height = wr.size.height;
1336 1337
1337 NSTRACE (x_set_window_size); 1338 NSTRACE (x_set_window_size);
1338 1339
@@ -1386,7 +1387,7 @@ x_set_window_size (struct frame *f,
1386 if (f->output_data.ns->zooming) 1387 if (f->output_data.ns->zooming)
1387 f->output_data.ns->zooming = 0; 1388 f->output_data.ns->zooming = 0;
1388 else 1389 else
1389 wr.origin.y += FRAME_PIXEL_HEIGHT (f) - pixelheight; 1390 wr.origin.y += orig_height - wr.size.height;
1390 1391
1391 [view setRows: rows andColumns: cols]; 1392 [view setRows: rows andColumns: cols];
1392 [window setFrame: wr display: YES]; 1393 [window setFrame: wr display: YES];