diff options
author | Jan Djärv <jan.h.d@swipnet.se> | 2009-03-27 18:30:55 +0000 |
---|---|---|
committer | Jan Djärv <jan.h.d@swipnet.se> | 2009-03-27 18:30:55 +0000 |
commit | 4e8b7ef122947eaf2209364501d81d10f38ba4f0 (patch) | |
tree | fb4ec786a10948eca3631790eebe38fb57a5bd3b /src | |
parent | 5f36ed277a061ec45fb7f1c621276d6605e685ed (diff) | |
download | emacs-4e8b7ef122947eaf2209364501d81d10f38ba4f0.tar.gz |
(x_set_font): If the fullscreen property is non-nil, adjust
lines and columns so we keep the same pixel height and width.
Diffstat (limited to 'src')
-rw-r--r-- | src/frame.c | 18 |
1 files changed, 18 insertions, 0 deletions
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; |