Commit 11e260be authored by Jason Rumney's avatar Jason Rumney

(x_font_min_bounds): Use FONT_AVG_WIDTH.

(w32_cache_char_metrics): Use FONT_WIDTH.
parent 12f7daf1
......@@ -1062,9 +1062,9 @@ w32_cache_char_metrics (font)
{
/* Use the font width and height as max bounds, as not all BDF
fonts contain the letter 'x'. */
font->max_bounds.width = FONT_MAX_WIDTH (font);
font->max_bounds.width = FONT_WIDTH (font);
font->max_bounds.lbearing = -font->bdf->llx;
font->max_bounds.rbearing = FONT_MAX_WIDTH (font) - font->bdf->urx;
font->max_bounds.rbearing = FONT_WIDTH (font) - font->bdf->urx;
font->max_bounds.ascent = FONT_BASE (font);
font->max_bounds.descent = FONT_DESCENT (font);
}
......@@ -6544,7 +6544,7 @@ x_font_min_bounds (font, w, h)
* average and maximum width, and maximum height.
*/
*h = FONT_HEIGHT (font);
*w = FONT_WIDTH (font);
*w = FONT_AVG_WIDTH (font);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment