From 8bea269da3f05149177d8dd6f43991f1cd61bcaf Mon Sep 17 00:00:00 2001 From: Martin Rudalics Date: Thu, 5 Dec 2013 14:46:30 +0100 Subject: [PATCH] In x_new_font calculate new frame sizes from new font size (Bug#16028). * w32term.c (x_new_font): * xterm.c (x_new_font): Calculate new frame size from new font size (Bug#16028). --- src/ChangeLog | 6 ++++++ src/w32term.c | 4 ++-- src/xterm.c | 3 ++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 2a4da678b5..5aec264590 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2013-12-05 Martin Rudalics + + * w32term.c (x_new_font): + * xterm.c (x_new_font): Calculate new frame size from new font + size (Bug#16028). + 2013-12-04 Stefan Monnier * lisp.h (FOR_EACH_TAIL): New macro. diff --git a/src/w32term.c b/src/w32term.c index 70625452d0..42a11e1eff 100644 --- a/src/w32term.c +++ b/src/w32term.c @@ -5479,8 +5479,8 @@ x_new_font (struct frame *f, Lisp_Object font_object, int fontset) doing it because it's done in Fx_show_tip, and it leads to problems because the tip frame has no widget. */ if (NILP (tip_frame) || XFRAME (tip_frame) != f) - x_set_window_size (f, 0, FRAME_TEXT_WIDTH (f), - FRAME_TEXT_HEIGHT (f), 1); + x_set_window_size (f, 0, FRAME_COLS (f) * FRAME_COLUMN_WIDTH (f), + FRAME_LINES (f) * FRAME_LINE_HEIGHT (f), 1); } /* X version sets font of input methods here also. */ diff --git a/src/xterm.c b/src/xterm.c index 0dbc4ac1c7..b1e773c437 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -7725,7 +7725,8 @@ x_new_font (struct frame *f, Lisp_Object font_object, int fontset) doing it because it's done in Fx_show_tip, and it leads to problems because the tip frame has no widget. */ if (NILP (tip_frame) || XFRAME (tip_frame) != f) - x_set_window_size (f, 0, FRAME_TEXT_WIDTH (f), FRAME_TEXT_HEIGHT (f), 1); + x_set_window_size (f, 0, FRAME_COLS (f) * FRAME_COLUMN_WIDTH (f), + FRAME_LINES (f) * FRAME_LINE_HEIGHT (f), 1); } #ifdef HAVE_X_I18N -- 2.39.2