From 2c6bfdbc8c2262c3550fa16d4472e29d73077956 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Sun, 3 Nov 2019 04:39:11 +0100
Subject: Implement debug view and load system fonts

---
 wgpu/src/font.rs | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 wgpu/src/font.rs

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

diff --git a/wgpu/src/font.rs b/wgpu/src/font.rs
new file mode 100644
index 00000000..e2838268
--- /dev/null
+++ b/wgpu/src/font.rs
@@ -0,0 +1,38 @@
+pub use font_kit::family_name::FamilyName as Family;
+
+pub struct Source {
+    raw: font_kit::sources::fontconfig::FontconfigSource,
+}
+
+impl Source {
+    pub fn new() -> Self {
+        Source {
+            raw: font_kit::sources::fontconfig::FontconfigSource::new(),
+        }
+    }
+
+    pub fn load(&self, families: &[Family]) -> Vec<u8> {
+        let font = self
+            .raw
+            .select_best_match(
+                families,
+                &font_kit::properties::Properties::default(),
+            )
+            .expect("Find font");
+
+        match font {
+            font_kit::handle::Handle::Path { path, .. } => {
+                use std::io::Read;
+
+                let mut buf = Vec::new();
+                let mut reader = std::fs::File::open(path).expect("Read font");
+                let _ = reader.read_to_end(&mut buf);
+
+                buf
+            }
+            font_kit::handle::Handle::Memory { bytes, .. } => {
+                bytes.as_ref().clone()
+            }
+        }
+    }
+}
-- 
cgit 


From 81cfb863ab676204aee5f5d1ed0a2bd953833081 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Sun, 3 Nov 2019 05:16:27 +0100
Subject: Use `SystemSource` instead of `FontconfigSource`

---
 wgpu/src/font.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/wgpu/src/font.rs b/wgpu/src/font.rs
index e2838268..9bba9b22 100644
--- a/wgpu/src/font.rs
+++ b/wgpu/src/font.rs
@@ -1,13 +1,13 @@
 pub use font_kit::family_name::FamilyName as Family;
 
 pub struct Source {
-    raw: font_kit::sources::fontconfig::FontconfigSource,
+    raw: font_kit::source::SystemSource,
 }
 
 impl Source {
     pub fn new() -> Self {
         Source {
-            raw: font_kit::sources::fontconfig::FontconfigSource::new(),
+            raw: font_kit::source::SystemSource::new(),
         }
     }
 
-- 
cgit 


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/font.rs | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

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

diff --git a/wgpu/src/font.rs b/wgpu/src/font.rs
index 9bba9b22..31df5bf4 100644
--- a/wgpu/src/font.rs
+++ b/wgpu/src/font.rs
@@ -1,3 +1,4 @@
+pub use font_kit::error::SelectionError as LoadError;
 pub use font_kit::family_name::FamilyName as Family;
 
 pub struct Source {
@@ -11,14 +12,11 @@ impl Source {
         }
     }
 
-    pub fn load(&self, families: &[Family]) -> Vec<u8> {
-        let font = self
-            .raw
-            .select_best_match(
-                families,
-                &font_kit::properties::Properties::default(),
-            )
-            .expect("Find font");
+    pub fn load(&self, families: &[Family]) -> Result<Vec<u8>, LoadError> {
+        let font = self.raw.select_best_match(
+            families,
+            &font_kit::properties::Properties::default(),
+        )?;
 
         match font {
             font_kit::handle::Handle::Path { path, .. } => {
@@ -28,10 +26,10 @@ impl Source {
                 let mut reader = std::fs::File::open(path).expect("Read font");
                 let _ = reader.read_to_end(&mut buf);
 
-                buf
+                Ok(buf)
             }
             font_kit::handle::Handle::Memory { bytes, .. } => {
-                bytes.as_ref().clone()
+                Ok(bytes.as_ref().clone())
             }
         }
     }
-- 
cgit