mslot
/
alacritty
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix linux symbol size 

With linux every box, line or underline should now have the
pixel-perfect size with any font at any size.

This uses the default font to get the size of the monospace box. It
assumes that the face 0 is always the primary font, if this is not the
case, this will probably break.
This commit is contained in:
Christian Duerr 2017-12-17 22:20:22 +01:00 committed by Joe Wilm
parent 7895e32083
commit 645100cf5f
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
font/src/ft/mod.rs
View File

@ -297,33 +297,37 @@ impl FreeTypeRasterizer {
// Render a custom symbol for the underline and beam cursor
match glyph_key.c {
super::UNDERLINE_CURSOR_CHAR => {
// Get the bottom of the bounding box
// Get the primary face metrics
let face = self.faces.get(&FontKey { token: 0 }).unwrap();
let size_metrics = face.ft_face
.size_metrics()
.ok_or(Error::MissingSizeMetrics)?;
// Get the bottom of the bounding box
let descent = (size_metrics.descender / 64) as i32;
// Get the width of the cell
let metrics = glyph.metrics();
let width = (metrics.vertAdvance as f32 / 128.).round() as i32;
let width = (size_metrics.max_advance / 64) as i32;
// Return the new custom glyph
super::get_underline_cursor_glyph(descent, width)
}
super::BEAM_CURSOR_CHAR | super::BOX_CURSOR_CHAR => {
// Get the top of the bounding box
// Get the primary face metrics
let face = self.faces.get(&FontKey { token: 0 }).unwrap();
let size_metrics = face.ft_face
.size_metrics()
.ok_or(Error::MissingSizeMetrics)?;
let ascent = (size_metrics.ascender / 64) as i32 - 1;
// Get the height of the cell
let height = (size_metrics.height / 64) as i32;
// Get the top of the bounding box
let descent = (size_metrics.descender / 64) as i32;
let height = ascent - descent;
let ascent = height + descent;
// Get the width of the cell
let metrics = glyph.metrics();
let width = (metrics.vertAdvance as f32 / 128.).round() as i32;
let width = (size_metrics.max_advance / 64) as i32;
// Return the new custom glyph
if glyph_key.c == super::BEAM_CURSOR_CHAR {