skyler
/
egui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Return `0.0` if font not found in `glyph_width` instead of panic (#7559)

This commit is contained in:
Lucas Meurer 2025-09-30 10:12:56 +02:00 committed by GitHub
parent 5ee88da61c
commit 47c5617740
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -478,12 +478,11 @@ impl Font<'_> {
/// Width of this character in points. /// Width of this character in points.
pub fn glyph_width(&mut self, c: char, font_size: f32) -> f32 { pub fn glyph_width(&mut self, c: char, font_size: f32) -> f32 {
let (key, glyph_info) = self.glyph_info(c); let (key, glyph_info) = self.glyph_info(c);
let font = &self if let Some(font) = &self.fonts_by_id.get(&key) {
.fonts_by_id glyph_info.advance_width_unscaled.0 * font.ab_glyph_font.px_scale_factor(font_size)
.get(&key) } else {
.expect("Nonexistent font ID") 0.0
.ab_glyph_font; }
glyph_info.advance_width_unscaled.0 * font.px_scale_factor(font_size)
} }
/// Can we display this glyph? /// Can we display this glyph?

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

@ -651,6 +651,8 @@ impl FontsView<'_> {
} }
/// Width of this character in points. /// Width of this character in points.
///
/// If the font doesn't exist, this will return `0.0`.
pub fn glyph_width(&mut self, font_id: &FontId, c: char) -> f32 { pub fn glyph_width(&mut self, font_id: &FontId, c: char) -> f32 {
self.fonts self.fonts
.font(&font_id.family) .font(&font_id.family)
@ -1302,4 +1304,13 @@ mod tests {
} }
} }
} }
#[test]
fn test_fallback_glyph_width() {
let mut fonts = Fonts::new(1024, AlphaFromCoverage::default(), FontDefinitions::empty());
let mut view = fonts.with_pixels_per_point(1.0);
let width = view.glyph_width(&FontId::new(12.0, FontFamily::Proportional), ' ');
assert_eq!(width, 0.0);
}
} }