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

Apply cargo fmt formatting fixes

Browse Source
This commit is contained in:
gcailly
2026-03-26 15:19:19 +01:00
parent c5cb18f769
commit 8a88f7c6c4
3 changed files with 40 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -606,8 +606,7 @@ impl FontFace {
None None
} else { } else {
Some(harfrust::ShaperInstance::from_variations( Some(harfrust::ShaperInstance::from_variations(
font_ref, font_ref, variations,
variations,
)) ))
}; };

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

@@ -811,9 +811,7 @@ impl FontsImpl {
/// Take the recycled shaping buffer (or create a new one if already taken). /// Take the recycled shaping buffer (or create a new one if already taken).
pub fn take_shape_buffer(&mut self) -> harfrust::UnicodeBuffer { pub fn take_shape_buffer(&mut self) -> harfrust::UnicodeBuffer {
self.shape_buffer self.shape_buffer.take().unwrap_or_default()
.take()
.unwrap_or_default()
} }
/// Return a shaping buffer for reuse. /// Return a shaping buffer for reuse.

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

@@ -227,11 +227,19 @@ fn layout_shaped_run(
let fallback_metrics = font let fallback_metrics = font
.fonts_by_id .fonts_by_id
.get(&fallback_key) .get(&fallback_key)
.map(|ff| ff.styled_metrics(ctx.pixels_per_point, ctx.font_size, &Default::default())) .map(|ff| {
ff.styled_metrics(ctx.pixels_per_point, ctx.font_size, &Default::default())
})
.unwrap_or_default(); .unwrap_or_default();
let (glyph_alloc, physical_x) = let (glyph_alloc, physical_x) =
if let Some(ff) = font.fonts_by_id.get_mut(&fallback_key) { if let Some(ff) = font.fonts_by_id.get_mut(&fallback_key) {
ff.allocate_glyph(font.atlas, &fallback_metrics, glyph_info, chr, paragraph.cursor_x_px) ff.allocate_glyph(
font.atlas,
&fallback_metrics,
glyph_info,
chr,
paragraph.cursor_x_px,
)
} else { } else {
Default::default() Default::default()
}; };
@@ -257,8 +265,13 @@ fn layout_shaped_run(
let (glyph_alloc, physical_x) = let (glyph_alloc, physical_x) =
if let Some(ff) = font.fonts_by_id.get_mut(&run.font_key) { if let Some(ff) = font.fonts_by_id.get_mut(&run.font_key) {
ff.allocate_glyph_by_id( ff.allocate_glyph_by_id(
font.atlas, face_metrics, glyph_id, x_advance_px, font.atlas,
h_pos, y_offset_points, is_cjk(chr), face_metrics,
glyph_id,
x_advance_px,
h_pos,
y_offset_points,
is_cjk(chr),
) )
} else { } else {
Default::default() Default::default()
@@ -360,12 +373,16 @@ fn layout_section(
flags |= harfrust::BufferFlags::END_OF_TEXT; flags |= harfrust::BufferFlags::END_OF_TEXT;
} }
let glyph_buffer = let glyph_buffer = font_face.shape_text(run_text, &format.coords, shape_buffer, flags);
font_face.shape_text(run_text, &format.coords, shape_buffer, flags);
layout_shaped_run( layout_shaped_run(
&mut font, run, run_text, &glyph_buffer, &mut font,
&face_metrics, &mut ctx, paragraph, run,
run_text,
&glyph_buffer,
&face_metrics,
&mut ctx,
paragraph,
); );
shape_buffer = glyph_buffer.clear(); shape_buffer = glyph_buffer.clear();
@@ -1477,10 +1494,7 @@ mod tests {
); );
let glyphs = &galley_combined.rows[0].row.glyphs; let glyphs = &galley_combined.rows[0].row.glyphs;
assert!( assert!(!glyphs.is_empty(), "Expected at least 1 glyph for ɔ̃");
!glyphs.is_empty(),
"Expected at least 1 glyph for ɔ̃"
);
} }
#[test] #[test]
@@ -1575,10 +1589,18 @@ mod tests {
for pair in ["AV", "VA", "AT"] { for pair in ["AV", "VA", "AT"] {
let (pair_w, _, _) = measure_text(&mut fonts, pair, &font_id, pixels_per_point); let (pair_w, _, _) = measure_text(&mut fonts, pair, &font_id, pixels_per_point);
let chars: Vec<char> = pair.chars().collect(); let chars: Vec<char> = pair.chars().collect();
let (w1, _, _) = let (w1, _, _) = measure_text(
measure_text(&mut fonts, &chars[0].to_string(), &font_id, pixels_per_point); &mut fonts,
let (w2, _, _) = &chars[0].to_string(),
measure_text(&mut fonts, &chars[1].to_string(), &font_id, pixels_per_point); &font_id,
pixels_per_point,
);
let (w2, _, _) = measure_text(
&mut fonts,
&chars[1].to_string(),
&font_id,
pixels_per_point,
);
let sum = w1 + w2; let sum = w1 + w2;
let kern_adjustment = sum - pair_w; let kern_adjustment = sum - pair_w;