diff options
| author |  Héctor Ramón Jiménez <hector0193@gmail.com> | 2020-05-19 20:20:51 +0200 |
|---|---|---|
| committer | Héctor Ramón Jiménez <hector0193@gmail.com> | 2020-05-19 20:20:51 +0200 |
| commit | e0c4f1a08e756f11c30a99cd739fe78267e5040b (patch) | |
| tree | 774428f9523f692f6fed50c4c28df24e9a6f69cc /glow | |
| parent | 4aed0fa4b6d63b739b5557ef16f6077988cd2758 (diff) | |
| download | iced-e0c4f1a08e756f11c30a99cd739fe78267e5040b.tar.gz iced-e0c4f1a08e756f11c30a99cd739fe78267e5040b.tar.bz2 iced-e0c4f1a08e756f11c30a99cd739fe78267e5040b.zip | |
Move `font::Source` to `iced_graphics`
Diffstat (limited to '')
| -rw-r--r-- | glow/Cargo.toml | 2 | ||||
| -rw-r--r-- | glow/src/text.rs | 4 | ||||
| -rw-r--r-- | graphics/src/font/source.rs (renamed from glow/src/text/font.rs) | 4 |
3 files changed, 3 insertions, 7 deletions
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/graphics/src/font/source.rs index 7346ccdb..6855aa93 100644 --- a/glow/src/text/font.rs +++ b/graphics/src/font/source.rs @@ -1,6 +1,4 @@ -pub use font_kit::{ - error::SelectionError as LoadError, family_name::FamilyName as Family, -}; +use crate::font::{Family, LoadError}; pub struct Source { raw: font_kit::source::SystemSource, |