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

Calculate current line width correctly when wrapping shaped lines

Browse source
This commit is contained in:
Antonio Scandurra 2021-08-25 15:21:04 +02:00
parent 399ecaabc6
commit 72f282eb3a
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gpui/src/text_layout.rs
View file

@ -458,7 +458,8 @@ impl LineWrapper {
glyph.position.x(),
)
})
});
})
.peekable();
iter::from_fn(move || {
while let Some((ix, c, x)) = glyphs.next() {
@ -475,7 +476,8 @@ impl LineWrapper {
first_non_whitespace_ix = Some(ix);
}
let width = x - last_wrap_x;
let next_x = glyphs.peek().map_or(line.width(), |(_, _, x)| *x);
let width = next_x - last_wrap_x;
if width > wrap_width && ix > last_wrap_ix {
if let Some(last_candidate_ix) = last_candidate_ix.take() {
last_wrap_ix = last_candidate_ix;
@ -623,7 +625,7 @@ mod tests {
}
#[crate::test(self)]
fn test_wrap_layout_line(cx: &mut crate::MutableAppContext) {
fn test_wrap_shaped_line(cx: &mut crate::MutableAppContext) {
let font_cache = cx.font_cache().clone();
let font_system = cx.platform().fonts();
let text_layout_cache = TextLayoutCache::new(font_system.clone());