mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-27 12:54:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Make room for font subpixel variants correctly

Browse source
This commit is contained in:
Antonio Scandurra 2022-04-13 11:36:54 +02:00
parent 6b629dfa5c
commit 6cc9306f00
1 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
crates/gpui/src/platform/mac/fonts.rs
View file

@ -159,7 +159,7 @@ impl FontSystemState {
) -> Option<(RectI, Vec<u8>)> { ) -> Option<(RectI, Vec<u8>)> {
let font = &self.fonts[font_id.0]; let font = &self.fonts[font_id.0];
let scale = Transform2F::from_scale(scale_factor); let scale = Transform2F::from_scale(scale_factor);
let bounds = font let glyph_bounds = font
.raster_bounds( .raster_bounds(
glyph_id, glyph_id,
font_size, font_size,
@ -169,26 +169,26 @@ impl FontSystemState {
) )
.ok()?; .ok()?;
if bounds.width() == 0 || bounds.height() == 0 { if glyph_bounds.width() == 0 || glyph_bounds.height() == 0 {
None None
} else { } else {
// Make room for subpixel variants. // Make room for subpixel variants.
let bounds = RectI::new(bounds.origin(), bounds.size() + vec2i(1, 1)); let cx_bounds = RectI::new(glyph_bounds.origin(), glyph_bounds.size() + vec2i(1, 1));
let mut pixels = vec![0; bounds.width() as usize * bounds.height() as usize]; let mut bytes = vec![0; cx_bounds.width() as usize * cx_bounds.height() as usize];
let cx = CGContext::create_bitmap_context( let cx = CGContext::create_bitmap_context(
Some(pixels.as_mut_ptr() as *mut _), Some(bytes.as_mut_ptr() as *mut _),
bounds.width() as usize, cx_bounds.width() as usize,
bounds.height() as usize, cx_bounds.height() as usize,
8, 8,
bounds.width() as usize, cx_bounds.width() as usize,
&CGColorSpace::create_device_gray(), &CGColorSpace::create_device_gray(),
kCGImageAlphaOnly, kCGImageAlphaOnly,
); );
// Move the origin to bottom left and account for scaling, this // Move the origin to bottom left and account for scaling, this
// makes drawing text consistent with the font-kit's raster_bounds. // makes drawing text consistent with the font-kit's raster_bounds.
cx.translate(0.0, bounds.height() as CGFloat); cx.translate(0.0, glyph_bounds.height() as CGFloat);
let transform = scale.translate(-bounds.origin().to_f32()); let transform = Transform2F::from_translation(-glyph_bounds.origin().to_f32());
cx.set_text_matrix(&CGAffineTransform { cx.set_text_matrix(&CGAffineTransform {
a: transform.matrix.m11() as CGFloat, a: transform.matrix.m11() as CGFloat,
b: -transform.matrix.m21() as CGFloat, b: -transform.matrix.m21() as CGFloat,
@ -198,20 +198,22 @@ impl FontSystemState {
ty: -transform.vector.y() as CGFloat, ty: -transform.vector.y() as CGFloat,
}); });
cx.set_allows_font_subpixel_positioning(true);
cx.set_should_subpixel_position_fonts(true); cx.set_should_subpixel_position_fonts(true);
cx.set_allows_font_subpixel_quantization(false);
cx.set_should_subpixel_quantize_fonts(false); cx.set_should_subpixel_quantize_fonts(false);
font.native_font() font.native_font()
.clone_with_font_size(font_size as CGFloat) .clone_with_font_size((font_size * scale_factor) as CGFloat)
.draw_glyphs( .draw_glyphs(
&[glyph_id as CGGlyph], &[glyph_id as CGGlyph],
&[CGPoint::new( &[CGPoint::new(
(subpixel_shift.x() / scale_factor) as CGFloat, subpixel_shift.x() as CGFloat,
(subpixel_shift.y() / scale_factor) as CGFloat, subpixel_shift.y() as CGFloat,
)], )],
cx, cx,
); );
Some((bounds, pixels)) Some((cx_bounds, bytes))
} }
} }