leyoda/cosmic-text
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Shape tabs as spaces, fixes #248

Browse source
This commit is contained in:
Jeremy Soller 2024-06-12 10:34:19 -06:00
parent a46e992396
commit 8bb45d7aca
No known key found for this signature in database
GPG key ID: D02FD439211AF56F
1 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/shape.rs
View file

@ -120,7 +120,15 @@ fn shape_fallback(
} else { } else {
rustybuzz::Direction::LeftToRight rustybuzz::Direction::LeftToRight
}); });
buffer.push_str(run); if run.contains('\t') {
// Push string to buffer, replacing tabs with spaces
//TODO: Find a way to do this with minimal allocating, calling
// UnicodeBuffer::push_str multiple times causes issues and
// UnicodeBuffer::add resizes the buffer with every character
buffer.push_str(&run.replace('\t', " "));
} else {
buffer.push_str(run);
}
buffer.guess_segment_properties(); buffer.guess_segment_properties();
let rtl = matches!(buffer.direction(), rustybuzz::Direction::RightToLeft); let rtl = matches!(buffer.direction(), rustybuzz::Direction::RightToLeft);
@ -853,10 +861,8 @@ impl ShapeLine {
for word in span.words.iter_mut() { for word in span.words.iter_mut() {
for glyph in word.glyphs.iter_mut() { for glyph in word.glyphs.iter_mut() {
if line.get(glyph.start..glyph.end) == Some("\t") { if line.get(glyph.start..glyph.end) == Some("\t") {
//TODO: better fallback for width // Tabs are shaped as spaces, so they will always have the x_advance of a space.
let space_x_advance = let tab_x_advance = (tab_width as f32) * glyph.x_advance;
glyph.font_monospace_em_width.unwrap_or(glyph.x_advance);
let tab_x_advance = (tab_width as f32) * space_x_advance;
let tab_stop = (math::floorf(x / tab_x_advance) + 1.0) * tab_x_advance; let tab_stop = (math::floorf(x / tab_x_advance) + 1.0) * tab_x_advance;
glyph.x_advance = tab_stop - x; glyph.x_advance = tab_stop - x;
} }