migrations/egui
1
0
Fork 0
mirror of https://github.com/emilk/egui.git synced 2026-08-29 04:40:03 -04:00
Code Activity

Use strongly typed CharIndex and ByteIndex + bug fixes (#8245)

Browse Source 
Less risk of confusing the two.

Found and fix a couple real bugs in the process!

---------

Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
Emil Ernerfeldt
2026-06-21 02:24:00 +02:00
committed by GitHub
parent eac51da9ca
commit 13d6b5afcf
15 changed files with 396 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
crates/epaint/src/text/text_layout.rs
View File

@@ -15,8 +15,8 @@ use crate::{
};
use super::{
FontsImpl, Galley, Glyph, LayoutJob, LayoutSection, PlacedRow, Row, RowVisuals,
VariationCoords,
ByteRangeExt as _, FontsImpl, Galley, Glyph, LayoutJob, LayoutSection, PlacedRow, Row,
RowVisuals, VariationCoords,
font::{Font, FontFace, ShapedGlyph},
};
@@ -454,7 +454,7 @@ fn layout_section(
}
paragraph.cursor_x_px += leading_space * pixels_per_point;
let section_text = &job.text[byte_range.clone()];
let section_text = &job.text[byte_range.as_usize()];
let mut ctx = ShapingContext {
pixels_per_point,
font_size,
@@ -1574,7 +1574,7 @@ mod tests {
pixels_per_point,
Arc::new(LayoutJob::single_section(
iter::chain(
(0..elided_galley.rows[0].char_count_excluding_newline()).map(|_| ch),
(0..elided_galley.rows[0].char_count_excluding_newline().0).map(|_| ch),
iter::once('…'),
)
.collect::<String>(),
@@ -1866,7 +1866,7 @@ mod tests {
// Verify cursor round-trip: end cursor index == char count.
assert_eq!(
galley.end().index,
galley.end().index.0,
expected_chars,
"Galley::end().index mismatch for {text:?}",
);
@@ -1892,9 +1892,9 @@ mod tests {
let galley = layout(&mut fonts, pixels_per_point, job.into());
// Walking through every cursor index should produce valid positions.
for i in 0..=galley.end().index {
for i in 0..=galley.end().index.0 {
let cursor = CCursor {
index: i,
index: CharIndex(i),
prefer_next_row: false,
};
let rect = galley.pos_from_cursor(cursor);