From 0157121038987feb6c2ea3066a21ce25e689888e Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Tue, 5 Nov 2019 03:57:13 +0100
Subject: Improve default font loading

---
 wgpu/src/renderer.rs | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

(limited to 'wgpu/src/renderer.rs')

diff --git a/wgpu/src/renderer.rs b/wgpu/src/renderer.rs
index c167f2bf..060f07a3 100644
--- a/wgpu/src/renderer.rs
+++ b/wgpu/src/renderer.rs
@@ -64,14 +64,17 @@ impl Renderer {
 
         // TODO: Font customization
         let font_source = font::Source::new();
-        let sans_serif_font = font_source.load(&[font::Family::SansSerif]);
-        let mono_font = font_source.load(&[font::Family::Monospace]);
-
-        let glyph_brush = GlyphBrushBuilder::using_fonts_bytes(vec![
-            sans_serif_font,
-            mono_font,
-        ])
-        .build(&mut device, TextureFormat::Bgra8UnormSrgb);
+        let default_font = font_source
+            .load(&[font::Family::SansSerif, font::Family::Serif])
+            .expect("Find sans-serif or serif font");
+
+        let mono_font = font_source
+            .load(&[font::Family::Monospace])
+            .expect("Find monospace font");
+
+        let glyph_brush =
+            GlyphBrushBuilder::using_fonts_bytes(vec![default_font, mono_font])
+                .build(&mut device, TextureFormat::Bgra8UnormSrgb);
 
         let quad_pipeline = quad::Pipeline::new(&mut device);
         let image_pipeline = crate::image::Pipeline::new(&mut device);
-- 
cgit