Move font::Source to iced_graphics
This commit is contained in:
parent
4aed0fa4b6
commit
e0c4f1a08e
9 changed files with 21 additions and 48 deletions
|
|
@ -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
|
||||
|
|
|
|||
10
graphics/src/font.rs
Normal file
10
graphics/src/font.rs
Normal file
|
|
@ -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,
|
||||
};
|
||||
35
graphics/src/font/source.rs
Normal file
35
graphics/src/font/source.rs
Normal file
|
|
@ -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())
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -6,6 +6,7 @@ mod viewport;
|
|||
mod widget;
|
||||
|
||||
pub mod backend;
|
||||
pub mod font;
|
||||
pub mod triangle;
|
||||
|
||||
#[doc(no_inline)]
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue