leyoda/cosmic-text
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Make FontSystem not self-referencing and update fontdb and rustybuzz"

Browse source
This commit is contained in:
Jeremy Soller 2023-03-02 18:16:57 -07:00 • committed by GitHub
parent b6398a2d57
commit eca804c732
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 179 additions and 225 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/swash.rs
View file

@ -20,10 +20,10 @@ fn swash_image(
context: &mut ScaleContext,
cache_key: CacheKey,
) -> Option<SwashImage> {
let font = match font_system.get_font(cache_key.font_key) {
let font = match font_system.get_font(cache_key.font_id) {
Some(some) => some,
None => {
log::warn!("did not find font {:?}", cache_key.font_key.id);
log::warn!("did not find font {:?}", cache_key.font_id);
return None;
}
};
@ -63,10 +63,10 @@ fn swash_outline_commands(
) -> Option<Vec<swash::zeno::Command>> {
use swash::zeno::PathData as _;
let font = match font_system.get_font(cache_key.font_key) {
let font = match font_system.get_font(cache_key.font_id) {
Some(some) => some,
None => {
log::warn!("did not find font {:?}", cache_key.font_key.id);
log::warn!("did not find font {:?}", cache_key.font_id);
return None;
}
};