From e0c4f1a08e756f11c30a99cd739fe78267e5040b Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Tue, 19 May 2020 20:20:51 +0200 Subject: Move `font::Source` to `iced_graphics` --- graphics/src/font.rs | 10 ++++++++++ graphics/src/font/source.rs | 35 +++++++++++++++++++++++++++++++++++ graphics/src/lib.rs | 1 + 3 files changed, 46 insertions(+) create mode 100644 graphics/src/font.rs create mode 100644 graphics/src/font/source.rs (limited to 'graphics/src') diff --git a/graphics/src/font.rs b/graphics/src/font.rs new file mode 100644 index 00000000..3890beba --- /dev/null +++ b/graphics/src/font.rs @@ -0,0 +1,10 @@ +#[cfg(feature = "font-source")] +mod source; + +#[cfg(feature = "font-source")] +pub use source::Source; + +#[cfg(feature = "font-source")] +pub use font_kit::{ + error::SelectionError as LoadError, family_name::FamilyName as Family, +}; diff --git a/graphics/src/font/source.rs b/graphics/src/font/source.rs new file mode 100644 index 00000000..6855aa93 --- /dev/null +++ b/graphics/src/font/source.rs @@ -0,0 +1,35 @@ +use crate::font::{Family, LoadError}; + +pub struct Source { + raw: font_kit::source::SystemSource, +} + +impl Source { + pub fn new() -> Self { + Source { + raw: font_kit::source::SystemSource::new(), + } + } + + pub fn load(&self, families: &[Family]) -> Result, LoadError> { + let font = self.raw.select_best_match( + families, + &font_kit::properties::Properties::default(), + )?; + + 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); + + Ok(buf) + } + font_kit::handle::Handle::Memory { bytes, .. } => { + Ok(bytes.as_ref().clone()) + } + } + } +} diff --git a/graphics/src/lib.rs b/graphics/src/lib.rs index bdaefb41..152dc7b0 100644 --- a/graphics/src/lib.rs +++ b/graphics/src/lib.rs @@ -6,6 +6,7 @@ mod viewport; mod widget; pub mod backend; +pub mod font; pub mod triangle; #[doc(no_inline)] -- cgit