(x_estimate_mode_line_height): If `mode-line' face
hasn't a font, use that of the frame, as drawing glyphs does.
This commit is contained in:
parent
4dd4cc1464
commit
43281ee3f4
1 changed files with 6 additions and 2 deletions
|
@ -2326,7 +2326,7 @@ x_estimate_mode_line_height (f, face_id)
|
|||
struct frame *f;
|
||||
enum face_id face_id;
|
||||
{
|
||||
int height = 1;
|
||||
int height = FONT_HEIGHT (FRAME_FONT (f));
|
||||
|
||||
/* This function is called so early when Emacs starts that the face
|
||||
cache and mode line face are not yet initialized. */
|
||||
|
@ -2334,7 +2334,11 @@ x_estimate_mode_line_height (f, face_id)
|
|||
{
|
||||
struct face *face = FACE_FROM_ID (f, face_id);
|
||||
if (face)
|
||||
height = FONT_HEIGHT (face->font) + 2 * face->box_line_width;
|
||||
{
|
||||
if (face->font)
|
||||
height = FONT_HEIGHT (face->font);
|
||||
height += 2 * face->box_line_width;
|
||||
}
|
||||
}
|
||||
|
||||
return height;
|
||||
|
|
Loading…
Add table
Reference in a new issue