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` --- glow/Cargo.toml | 2 +- glow/src/text.rs | 4 +--- glow/src/text/font.rs | 37 ------------------------------------- 3 files changed, 2 insertions(+), 41 deletions(-) delete mode 100644 glow/src/text/font.rs (limited to 'glow') diff --git a/glow/Cargo.toml b/glow/Cargo.toml index 212fbb30..158e2bf0 100644 --- a/glow/Cargo.toml +++ b/glow/Cargo.toml @@ -13,7 +13,6 @@ euclid = "0.20" glow = "0.4" bytemuck = "1.2" glam = "0.8" -font-kit = "0.6" log = "0.4" glyph_brush = "0.6" @@ -24,6 +23,7 @@ path = "../native" [dependencies.iced_graphics] version = "0.1" path = "../graphics" +features = ["font-source"] [dependencies.surfman] path = "../../surfman/surfman" diff --git a/glow/src/text.rs b/glow/src/text.rs index 159c80a6..be88ceaf 100644 --- a/glow/src/text.rs +++ b/glow/src/text.rs @@ -1,7 +1,5 @@ -mod font; - use crate::Transformation; - +use iced_graphics::font; use std::{cell::RefCell, collections::HashMap}; pub const BUILTIN_ICONS: iced_native::Font = iced_native::Font::External { diff --git a/glow/src/text/font.rs b/glow/src/text/font.rs deleted file mode 100644 index 7346ccdb..00000000 --- a/glow/src/text/font.rs +++ /dev/null @@ -1,37 +0,0 @@ -pub use font_kit::{ - error::SelectionError as LoadError, family_name::FamilyName as Family, -}; - -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()) - } - } - } -} -- cgit