migrations/egui
1
0
Fork 0
mirror of https://github.com/emilk/egui.git synced 2026-09-01 14:20:04 -04:00
Code Activity

Fix Row::ends_with_newline docs, explain skipping of last galley row

Browse Source
This commit is contained in:
Fishhh
2024-11-30 18:17:38 +01:00
parent fd8413c62a
commit bbe566256e
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
crates/epaint/src/text/fonts.rs
View File

@@ -807,6 +807,9 @@ impl GalleyCache {
let current_offset = emath::vec2(0.0, merged_galley.rect.height()); let current_offset = emath::vec2(0.0, merged_galley.rect.height());
let mut rows = galley.rows.iter(); let mut rows = galley.rows.iter();
// As documented in `Row::ends_with_newline`, a '\n' will always create a
// new `Row` immediately below the current one. Here it doesn't make sense
// for us to append this new row so we just ignore it.
if i != galleys.len() - 1 && !galley.elided { if i != galleys.len() - 1 && !galley.elided {
let popped = rows.next_back(); let popped = rows.next_back();
debug_assert_eq!(popped.unwrap().row.glyphs.len(), 0); debug_assert_eq!(popped.unwrap().row.glyphs.len(), 0);

2
crates/epaint/src/text/text_layout_types.rs
View File

@@ -581,7 +581,7 @@ pub struct Row {
pub visuals: RowVisuals, pub visuals: RowVisuals,
/// If true, this [`Row`] came from a paragraph ending with a `\n`. /// If true, this [`Row`] came from a paragraph ending with a `\n`.
/// The `\n` itself is omitted from [`glyphs`]. /// The `\n` itself is omitted from [`Self::glyphs`].
/// A `\n` in the input text always creates a new [`Row`] below it, /// A `\n` in the input text always creates a new [`Row`] below it,
/// so that text that ends with `\n` has an empty [`Row`] last. /// so that text that ends with `\n` has an empty [`Row`] last.
/// This also implies that the last [`Row`] in a [`Galley`] always has `ends_with_newline == false`. /// This also implies that the last [`Row`] in a [`Galley`] always has `ends_with_newline == false`.