forestia/bevy
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not assume font handle is present in assets. (#490)

Browse Source
This commit is contained in:
Boutillier 2020-09-19 21:57:52 +02:00 committed by GitHub
parent 4b83cfc729
commit b9f18efd86
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 65 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
crates/bevy_text/src/font_atlas_set.rs
View File

@ -52,7 +52,8 @@ impl FontAtlasSet {
font_size: f32,
text: &str,
) -> f32 {
let font = fonts.get(&self.font).unwrap();
let mut width = 0.0;
if let Some(font) = fonts.get(&self.font) {
let scaled_font = ab_glyph::Font::as_scaled(&font.font, font_size);
let font_atlases = self
.font_atlases
@ -66,7 +67,6 @@ impl FontAtlasSet {
});
let mut last_glyph: Option<Glyph> = None;
let mut width = 0.0;
for character in text.chars() {
if character.is_control() {
continue;
@ -100,10 +100,11 @@ impl FontAtlasSet {
}
}
}
}
width += scaled_font.h_advance(glyph.id);
last_glyph = Some(glyph);
}
}
}
width
}

4
crates/bevy_ui/src/widget/text.rs
View File

@ -61,9 +61,10 @@ pub fn draw_text_system(
mut query: Query<(&mut Draw, &Text, &Node, &GlobalTransform)>,
) {
for (mut draw, text, node, global_transform) in &mut query.iter() {
if let Some(font) = fonts.get(&text.font) {
let position = global_transform.translation() - (node.size / 2.0).extend(0.0);
let mut drawable_text = DrawableText {
font: fonts.get(&text.font).unwrap(),
font,
font_atlas_set: font_atlas_sets
.get(&text.font.as_handle::<FontAtlasSet>())
.unwrap(),
@ -79,3 +80,4 @@ pub fn draw_text_system(
drawable_text.draw(&mut draw, &mut draw_context).unwrap();
}
}
}