Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
emilk merged 2 commits into from
Sep 30, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ab13f25
Return 0.0 if font not found in glyph_width
lucasmerlin Sep 23, 2025
ea53e8c
Remove debug assert
lucasmerlin Sep 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions crates/epaint/src/text/font.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -478,12 +478,11 @@ impl Font<'_> {
/// Width of this character in points.
pub fn glyph_width(&mut self, c: char, font_size: f32) -> f32 {
let (key, glyph_info) = self.glyph_info(c);
let font = &self
.fonts_by_id
.get(&key)
.expect("Nonexistent font ID")
.ab_glyph_font;
glyph_info.advance_width_unscaled.0 * font.px_scale_factor(font_size)
if let Some(font) = &self.fonts_by_id.get(&key) {
glyph_info.advance_width_unscaled.0 * font.ab_glyph_font.px_scale_factor(font_size)
} else {
0.0
}
}

/// Can we display this glyph?
Expand Down
11 changes: 11 additions & 0 deletions crates/epaint/src/text/fonts.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -651,6 +651,8 @@ impl FontsView<'_> {
}

/// 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 {
self.fonts
.font(&font_id.family)
Expand Down Expand Up @@ -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);
}
}