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

Remove TextError::ExceedMaxTextAtlases(usize) variant (#6796)

Browse Source 
# Objective

Fixes #6756

## Solution

Removes the variant wherever it's used

Co-authored-by: Jay Pavlina <jay@enjin.io>
This commit is contained in:
Jay Pavlina 2022-12-05 23:23:16 +00:00
parent 83e8224694
commit e621acd7f2
3 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
crates/bevy_text/src/error.rs
View File

@ -7,7 +7,4 @@ pub enum TextError {
NoSuchFont, NoSuchFont,
#[error("failed to add glyph to newly-created atlas {0:?}")] #[error("failed to add glyph to newly-created atlas {0:?}")]
FailedToAddGlyph(GlyphId), FailedToAddGlyph(GlyphId),
// TODO this is not used. Remove it.
#[error("exceeded {0:?} available TextAltases for font. This can be caused by using an excessive number of font sizes or ui scaling. If you are changing font sizes or ui scaling dynamically consider using Transform::scale to modify the size. If you need more font sizes modify TextSettings.max_font_atlases." )]
ExceedMaxTextAtlases(usize),
} }

3
crates/bevy_text/src/text2d.rs
View File

@ -207,8 +207,7 @@ pub fn update_text2d_layout(
// queue for further processing // queue for further processing
queue.insert(entity); queue.insert(entity);
} }
Err(e @ TextError::FailedToAddGlyph(_)) Err(e @ TextError::FailedToAddGlyph(_)) => {
| Err(e @ TextError::ExceedMaxTextAtlases(_)) => {
panic!("Fatal error when processing text: {e}."); panic!("Fatal error when processing text: {e}.");
} }
Ok(info) => { Ok(info) => {

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

@ -135,8 +135,7 @@ pub fn text_system(
// queue for further processing // queue for further processing
new_queue.push(entity); new_queue.push(entity);
} }
Err(e @ TextError::FailedToAddGlyph(_)) Err(e @ TextError::FailedToAddGlyph(_)) => {
| Err(e @ TextError::ExceedMaxTextAtlases(_)) => {
panic!("Fatal error when processing text: {e}."); panic!("Fatal error when processing text: {e}.");
} }
Ok(info) => { Ok(info) => {