Fix incorrect line breaks

emilk · Apr 17, 2024 · 5c13c84 · 5c13c84
1 parent 78d95f4
commit 5c13c84
Showing 1 changed file with 22 additions and 1 deletion.
diff --git a/crates/epaint/src/text/text_layout.rs b/crates/epaint/src/text/text_layout.rs
@@ -296,7 +296,7 @@ fn line_break(paragraph: &Paragraph, job: &LayoutJob, out_rows: &mut Vec<Row>, e
                 // Start a new row:
                 row_start_idx = last_kept_index + 1;
                 row_start_x = paragraph.glyphs[row_start_idx].pos.x;
-                row_break_candidates = Default::default();
+                row_break_candidates.forget_candiates_before_idx(row_start_idx);
             } else {
                 // Found no place to break, so we have to overrun wrap_width.
             }
@@ -943,6 +943,27 @@ impl RowBreakCandidates {
                 .or(self.any)
         }
     }
+
+    fn forget_candiates_before_idx(&mut self, index: usize) {
+        if self.space.map(|s| s < index).unwrap_or_default() {
+            self.space = None;
+        }
+        if self.cjk.map(|s| s < index).unwrap_or_default() {
+            self.cjk = None;
+        }
+        if self.pre_cjk.map(|s| s < index).unwrap_or_default() {
+            self.pre_cjk = None;
+        }
+        if self.dash.map(|s| s < index).unwrap_or_default() {
+            self.dash = None;
+        }
+        if self.punctuation.map(|s| s < index).unwrap_or_default() {
+            self.punctuation = None;
+        }
+        if self.any.map(|s| s < index).unwrap_or_default() {
+            self.any = None;
+        }
+    }
 }
 
 #[inline]