Skip to content

Commit 3156506

Browse files
committed
use ID from FontDB::load_font_source
1 parent eac113a commit 3156506

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

crates/bevy_text/src/pipeline.rs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -387,20 +387,18 @@ fn get_attrs<'a>(
387387
.or_insert_with(|| {
388388
let font = fonts.get(font_handle).unwrap();
389389
let data = Arc::clone(&font.data);
390-
font_system
390+
let ids = font_system
391391
.db_mut()
392392
.load_font_source(cosmic_text::fontdb::Source::Binary(data));
393393
// TODO: it is assumed this is the right font face
394-
// see https://github.com/pop-os/cosmic-text/issues/125
395-
// fontdb 0.14 returns the font ids from `load_font_source`
396-
let face_id = font_system.db().faces().last().unwrap().id;
394+
ids.last().unwrap().clone()
395+
397396
// TODO: below may be required if we need to offset by the baseline (TBC)
398397
// see https://github.com/pop-os/cosmic-text/issues/123
399398
// let font = font_system.get_font(face_id).unwrap();
400399
// map_font_id_to_metrics
401400
// .entry(face_id)
402401
// .or_insert_with(|| font.as_swash().metrics(&[]));
403-
face_id
404402
});
405403
let face = font_system.db().face(*face_id).unwrap();
406404

0 commit comments

Comments
 (0)