zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-07 02:38:53 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug where Text element would wrap at the right glyph in the wrong run

Browse Source
This commit is contained in:
Max Brunsfeld 2023-04-26 15:32:19 -07:00
parent 1bbcff543b
commit 7960067cf9
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
crates/gpui/src/elements/text.rs
View File

@ -226,17 +226,20 @@ impl<V: View> Element<V> for Text {
let mut glyph_origin = origin;
let mut prev_position = 0.;
let mut wrap_boundaries = wrap_boundaries.iter().copied().peekable();
for (glyph_ix, glyph) in line
.runs()
.iter()
.flat_map(|run| run.glyphs().iter().enumerate())
for (run_ix, glyph_ix, glyph) in
line.runs().iter().enumerate().flat_map(|(run_ix, run)| {
run.glyphs()
.iter()
.enumerate()
.map(move |(ix, glyph)| (run_ix, ix, glyph))
})
{
glyph_origin.set_x(glyph_origin.x() + glyph.position.x() - prev_position);
prev_position = glyph.position.x();
if wrap_boundaries
.peek()
.map_or(false, |b| b.glyph_ix == glyph_ix)
.map_or(false, |b| b.run_ix == run_ix && b.glyph_ix == glyph_ix)
{
if let Some((mouse_run_ix, mouse_region_start)) = &mut current_mouse_run
{

7
crates/gpui/src/text_layout.rs
View File

@ -407,11 +407,14 @@ impl Line {
let mut glyph_origin = origin;
let mut prev_position = 0.;
for run in &self.layout.runs {
for (run_ix, run) in self.layout.runs.iter().enumerate() {
for (glyph_ix, glyph) in run.glyphs.iter().enumerate() {
glyph_origin.set_x(glyph_origin.x() + glyph.position.x() - prev_position);
if boundaries.peek().map_or(false, |b| b.glyph_ix == glyph_ix) {
if boundaries
.peek()
.map_or(false, |b| b.run_ix == run_ix && b.glyph_ix == glyph_ix)
{
boundaries.next();
if let Some((underline_origin, underline_style)) = underline {
scene.push_underline(scene::Underline {