migrations/egui
1
0
Fork 0
mirror of https://github.com/emilk/egui.git synced 2026-09-02 06:40:06 -04:00
Code Activity

Small code cleanup

Browse Source
This commit is contained in:
Emil Ernerfeldt
2025-03-30 16:37:43 +02:00
parent 88340eee76
commit 3d70f7289a
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -554,6 +554,8 @@ pub struct PlacedRow {
pub row: Arc<Row>, pub row: Arc<Row>,
/// The position of this [`Row`] relative to the galley. /// The position of this [`Row`] relative to the galley.
///
/// This is rounded to the closest _pixel_ in order to produce crisp, pixel-perfect text.
pub pos: Pos2, pub pos: Pos2,
} }
@@ -874,15 +876,15 @@ impl Galley {
job, job,
rows: Vec::new(), rows: Vec::new(),
elided: false, elided: false,
rect: emath::Rect::ZERO, rect: Rect::ZERO,
mesh_bounds: emath::Rect::NOTHING, mesh_bounds: Rect::NOTHING,
num_vertices: 0, num_vertices: 0,
num_indices: 0, num_indices: 0,
pixels_per_point, pixels_per_point,
}; };
for (i, galley) in galleys.iter().enumerate() { for (i, galley) in galleys.iter().enumerate() {
let current_offset = Vec2::new(0.0, merged_galley.rect.height()); let current_y_offset = 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 // As documented in `Row::ends_with_newline`, a '\n' will always create a
@@ -895,14 +897,14 @@ impl Galley {
} }
merged_galley.rows.extend(rows.map(|placed_row| { merged_galley.rows.extend(rows.map(|placed_row| {
let mut new_pos = placed_row.pos + current_offset; let new_pos = placed_row.pos + current_y_offset * Vec2::Y;
new_pos.y = new_pos.y.round_to_pixels(pixels_per_point); let new_pos = new_pos.round_to_pixels(pixels_per_point);
merged_galley.mesh_bounds = merged_galley merged_galley.mesh_bounds = merged_galley
.mesh_bounds .mesh_bounds
.union(placed_row.visuals.mesh_bounds.translate(new_pos.to_vec2())); .union(placed_row.visuals.mesh_bounds.translate(new_pos.to_vec2()));
merged_galley.rect = merged_galley merged_galley.rect = merged_galley
.rect .rect
.union(emath::Rect::from_min_size(new_pos, placed_row.size)); .union(Rect::from_min_size(new_pos, placed_row.size));
super::PlacedRow { super::PlacedRow {
row: placed_row.row.clone(), row: placed_row.row.clone(),