From c7511666094a87021e0f3685657bfc9e380d67a7 Mon Sep 17 00:00:00 2001 From: Jan D Date: Tue, 6 Jan 2015 20:30:39 +0100 Subject: [PATCH] NS: Fix frame size when height and font set at startup. * nsterm.m (x_set_window_size): Call updateFrameSize to get real size instead of using widht/height. The frame may be constrained. --- src/ChangeLog | 5 +++++ src/nsterm.m | 9 +-------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 69da1c35c91..861ba91c275 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2015-01-06 Jan Djärv + + * nsterm.m (x_set_window_size): Call updateFrameSize to get real + size instead of using widht/height. The frame may be constrained. + 2015-01-05 Paul Eggert * lisp.h (XSYMBOL): Parenthesize id in forward decl. diff --git a/src/nsterm.m b/src/nsterm.m index 2ccb7fe0c60..bf3192bf432 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -1404,15 +1404,8 @@ x_set_window_size (struct frame *f, [view setBoundsOrigin: origin]; } - change_frame_size (f, width, height, 0, 1, 0, pixelwise); -/* SET_FRAME_GARBAGED (f); // this short-circuits expose call in drawRect */ - - mark_window_cursors_off (XWINDOW (f->root_window)); - cancel_mouse_face (f); - + [view updateFrameSize: NO]; unblock_input (); - - do_pending_window_change (0); } -- 2.39.2