leyoda/libcosmic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix missing empty lines

Browse source
This commit is contained in:
Jeremy Soller 2022-10-04 21:25:48 -06:00
parent ccf8626aca
commit 5299dfaa8c
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
examples/text/src/main.rs
View file

@ -79,6 +79,7 @@ struct FontShapeLine<'a> {
impl<'a> FontShapeLine<'a> { impl<'a> FontShapeLine<'a> {
pub fn layout(&self, font_size: i32, line_width: i32, lines: &mut Vec<FontLayoutLine<'a>>) { pub fn layout(&self, font_size: i32, line_width: i32, lines: &mut Vec<FontLayoutLine<'a>>) {
let mut push_line = true;
let mut glyphs = Vec::new(); let mut glyphs = Vec::new();
let mut x = 0.0; let mut x = 0.0;
@ -118,6 +119,7 @@ impl<'a> FontShapeLine<'a> {
let mut glyphs_swap = Vec::new(); let mut glyphs_swap = Vec::new();
std::mem::swap(&mut glyphs, &mut glyphs_swap); std::mem::swap(&mut glyphs, &mut glyphs_swap);
lines.push(FontLayoutLine { glyphs: glyphs_swap }); lines.push(FontLayoutLine { glyphs: glyphs_swap });
push_line = false;
x = 0.0; x = 0.0;
y = 0.0; y = 0.0;
@ -138,6 +140,7 @@ impl<'a> FontShapeLine<'a> {
w: x_advance, w: x_advance,
inner, inner,
}); });
push_line = true;
x += x_advance; x += x_advance;
y += y_advance; y += y_advance;
@ -148,7 +151,7 @@ impl<'a> FontShapeLine<'a> {
} }
} }
if ! glyphs.is_empty() { if push_line {
lines.push(FontLayoutLine { glyphs }); lines.push(FontLayoutLine { glyphs });
} }
} }