From 18f5801fb4026dcf1fa3910a09003bac59f6f116 Mon Sep 17 00:00:00 2001 From: Chad Brokaw Date: Fri, 4 Oct 2024 12:46:51 -0400 Subject: [PATCH] [fauntlet] improve readability in skrifa outline extraction --- fauntlet/src/font/skrifa.rs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/fauntlet/src/font/skrifa.rs b/fauntlet/src/font/skrifa.rs index 9c94b312..01fcee9d 100644 --- a/fauntlet/src/font/skrifa.rs +++ b/fauntlet/src/font/skrifa.rs @@ -70,11 +70,13 @@ impl<'a> SkrifaInstance<'a> { .outlines .get(glyph_id) .ok_or(DrawError::GlyphNotFound(glyph_id))?; - let metrics = if let Some(hinter) = self.hinter.as_ref() { - outline.draw(DrawSettings::hinted(hinter, false), pen)? + let draw_settings = if let Some(hinter) = self.hinter.as_ref() { + DrawSettings::hinted(hinter, false) } else { - outline.draw((self.size, self.coords.as_slice()), pen)? + DrawSettings::unhinted(self.size, self.coords.as_slice()) }; - Ok(metrics.advance_width) + outline + .draw(draw_settings, pen) + .map(|metrics| metrics.advance_width) } }