From 5a9aae2ec9867f38788c139883213b47d354a13b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20Dj=C3=A4rv?= Date: Fri, 27 Mar 2009 18:30:55 +0000 Subject: [PATCH] (x_set_font): If the fullscreen property is non-nil, adjust lines and columns so we keep the same pixel height and width. --- src/frame.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/frame.c b/src/frame.c index a501e4de834..650eea1f1b7 100644 --- a/src/frame.c +++ b/src/frame.c @@ -3422,7 +3422,25 @@ x_set_font (f, arg, oldval) if (! NILP (Fequal (font_object, oldval))) return; + + + Lisp_Object lval = Fassq (Qfullscreen, f->param_alist); + if (CONSP (lval)) lval = CDR (lval); + x_new_font (f, font_object, fontset); + /* If the fullscreen property is non-nil, adjust lines and columns so we + keep the same pixel height and width. */ + if (! NILP (lval)) + { + int height = FRAME_LINES (f), width = FRAME_COLS (f); + if (EQ (lval, Qfullboth) || EQ (lval, Qfullwidth)) + width = FRAME_PIXEL_WIDTH_TO_TEXT_COLS (f, FRAME_PIXEL_WIDTH (f)); + if (EQ (lval, Qfullboth) || EQ (lval, Qfullheight)) + height = FRAME_PIXEL_HEIGHT_TO_TEXT_LINES (f, FRAME_PIXEL_HEIGHT (f)); + + change_frame_size (f, height, width, 0, 0, 1); + } + store_frame_param (f, Qfont, arg); /* Recalculate toolbar height. */ f->n_tool_bar_rows = 0; -- 2.39.5