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 /graphics | |
| 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-- | graphics/Cargo.toml | 5 | ||||
| -rw-r--r-- | graphics/src/font.rs | 10 | ||||
| -rw-r--r-- | graphics/src/font/source.rs (renamed from glow/src/text/font.rs) | 4 | ||||
| -rw-r--r-- | graphics/src/lib.rs | 1 |
4 files changed, 17 insertions, 3 deletions
diff --git a/graphics/Cargo.toml b/graphics/Cargo.toml index a81807d6..c937763c 100644 --- a/graphics/Cargo.toml +++ b/graphics/Cargo.toml @@ -6,6 +6,7 @@ edition = "2018" [features] canvas = ["lyon"] +font-source = ["font-kit"] [dependencies] bytemuck = "1.2" @@ -22,3 +23,7 @@ path = "../style" [dependencies.lyon] version = "0.15" optional = true + +[dependencies.font-kit] +version = "0.6" +optional = true 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/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, 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)] |