mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-04-19 04:21:45 -07:00
Code Issues Projects Releases Wiki Activity

(window_box_height): Only use mode-line glyph-rows that are actually

Browse source 
marked as mode-lines; otherwise use estimate_mode_line_height.
This commit is contained in:
Miles Bader 2000-12-15 00:59:56 +00:00
parent 8f530b953c
commit 97dff879ca
1 changed files with 20 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/xdisp.c
View file

@ -843,10 +843,28 @@ window_box_height (w)
xassert (height >= 0);
if (WINDOW_WANTS_MODELINE_P (w))
height -= CURRENT_MODE_LINE_HEIGHT (w);
{
struct glyph_row *ml_row
= (w->current_matrix && w->current_matrix->rows
? MATRIX_MODE_LINE_ROW (w->current_matrix)
: 0);
if (ml_row && ml_row->mode_line_p)
height -= ml_row->height;
else
height -= estimate_mode_line_height (f, MODE_LINE_FACE_ID);
}
if (WINDOW_WANTS_HEADER_LINE_P (w))
height -= CURRENT_HEADER_LINE_HEIGHT (w);
{
struct glyph_row *hl_row
= (w->current_matrix && w->current_matrix->rows
? MATRIX_HEADER_LINE_ROW (w->current_matrix)
: 0);
if (hl_row && hl_row->mode_line_p)
height -= hl_row->height;
else
height -= estimate_mode_line_height (f, HEADER_LINE_FACE_ID);
}
return height;
}