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

Merge pull request #82 from grovesNL/y-offset

Browse source 
Exclude line y offset in height comparison
This commit is contained in:
Jeremy Soller 2023-02-24 08:21:31 -07:00 • committed by GitHub
commit 5fc5d2bbdc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/buffer.rs
View file

@ -207,7 +207,7 @@ impl<'a, 'b> LayoutRunIter<'a, 'b> {
line_i: 0, line_i: 0,
layout_i: 0, layout_i: 0,
remaining_len: bottom_cropped_layout_lines as usize, remaining_len: bottom_cropped_layout_lines as usize,
line_y: buffer.metrics.font_size - buffer.metrics.line_height, line_y: buffer.metrics.y_offset(),
total_layout: 0, total_layout: 0,
} }
} }
@ -234,7 +234,7 @@ impl<'a, 'b> Iterator for LayoutRunIter<'a, 'b> {
} }
self.line_y += self.buffer.metrics.line_height; self.line_y += self.buffer.metrics.line_height;
if self.line_y > self.buffer.height { if self.line_y - self.buffer.metrics.y_offset() > self.buffer.height {
return None; return None;
} }
@ -281,6 +281,10 @@ impl Metrics {
line_height: self.line_height * scale, line_height: self.line_height * scale,
} }
} }
fn y_offset(&self) -> i32 {
self.font_size - self.line_height
}
} }
impl fmt::Display for Metrics { impl fmt::Display for Metrics {