summaryrefslogtreecommitdiffstats
path: root/graphics
diff options
context:
space:
mode:
authorLibravatar Héctor Ramón Jiménez <hector0193@gmail.com>2020-05-19 20:20:51 +0200
committerLibravatar Héctor Ramón Jiménez <hector0193@gmail.com>2020-05-19 20:20:51 +0200
commite0c4f1a08e756f11c30a99cd739fe78267e5040b (patch)
tree774428f9523f692f6fed50c4c28df24e9a6f69cc /graphics
parent4aed0fa4b6d63b739b5557ef16f6077988cd2758 (diff)
downloadiced-e0c4f1a08e756f11c30a99cd739fe78267e5040b.tar.gz
iced-e0c4f1a08e756f11c30a99cd739fe78267e5040b.tar.bz2
iced-e0c4f1a08e756f11c30a99cd739fe78267e5040b.zip
Move `font::Source` to `iced_graphics`
Diffstat (limited to 'graphics')
-rw-r--r--graphics/Cargo.toml5
-rw-r--r--graphics/src/font.rs10
-rw-r--r--graphics/src/font/source.rs35
-rw-r--r--graphics/src/lib.rs1
4 files changed, 51 insertions, 0 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/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<Vec<u8>, 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)]