diff options
| author | Laurenz <laurmaedje@gmail.com> | 2020-10-12 16:59:21 +0200 |
|---|---|---|
| committer | Laurenz <laurmaedje@gmail.com> | 2020-10-12 16:59:21 +0200 |
| commit | e94627721db89c3b08aa17f54d59d19a09f7816f (patch) | |
| tree | 01d5f64d48beaa1c5edc848f9a2a6fe5b36386d7 /src | |
| parent | a2a68106c025ada726e291df4d7e5aa624f68410 (diff) | |
Adapt to fontdock 🔼
Diffstat (limited to 'src')
| -rw-r--r-- | src/font.rs | 12 | ||||
| -rw-r--r-- | src/layout/text.rs | 3 | ||||
| -rw-r--r-- | src/shaping.rs | 4 |
3 files changed, 9 insertions, 10 deletions
diff --git a/src/font.rs b/src/font.rs index 9901ff1c..513c31f1 100644 --- a/src/font.rs +++ b/src/font.rs @@ -3,17 +3,17 @@ use std::cell::RefCell; use std::rc::Rc; -use fontdock::{ContainsChar, FaceFromVec, FontProvider}; +use fontdock::{ContainsChar, FaceFromVec, FontSource}; use ttf_parser::Face; -/// A reference-counted shared font loader backed by a dynamic font provider. +/// A reference-counted shared font loader backed by a dynamic font source. pub type SharedFontLoader = Rc<RefCell<FontLoader>>; -/// A font loader backed by a dynamic provider. -pub type FontLoader = fontdock::FontLoader<Box<DynProvider>>; +/// A font loader backed by a dynamic source. +pub type FontLoader = fontdock::FontLoader<Box<DynSource>>; -/// The dynamic font provider backing the font loader. -pub type DynProvider = dyn FontProvider<Face = OwnedFace>; +/// The dynamic font source. +pub type DynSource = dyn FontSource<Face = OwnedFace>; /// An owned font face. pub struct OwnedFace { diff --git a/src/layout/text.rs b/src/layout/text.rs index 7d8386a1..a4156fd3 100644 --- a/src/layout/text.rs +++ b/src/layout/text.rs @@ -35,8 +35,7 @@ impl Layout for Text { self.dir, &self.families, self.variant, - ) - .await, + ), self.aligns, )] } diff --git a/src/shaping.rs b/src/shaping.rs index 5c718acb..83cc0cf1 100644 --- a/src/shaping.rs +++ b/src/shaping.rs @@ -61,7 +61,7 @@ impl Debug for Shaped { /// Shape text into a box containing [`Shaped`] runs. /// /// [`Shaped`]: struct.Shaped.html -pub async fn shape( +pub fn shape( loader: &mut FontLoader, text: &str, font_size: Length, @@ -84,7 +84,7 @@ pub async fn shape( for c in chars { let query = FaceQuery { fallback: fallback.iter(), variant, c }; - if let Some((id, owned_face)) = loader.query(query).await { + if let Some((id, owned_face)) = loader.query(query) { let face = owned_face.get(); let (glyph, width) = match lookup_glyph(face, c, font_size) { Some(v) => v, |