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

* Removed the needs_recompute field from TextNodeFlags. Set needs_rerender on ComputedTextBlock instead to request relayouts.

Browse Source 
* Added a `set_needs_rerender` method to `ComputedTextBlock`.
This commit is contained in:
ickshonpe 2025-05-30 19:52:32 +01:00
parent 0ee8bf978c
commit ea2cf1e73c
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crates/bevy_text/src/text.rs
View File

@ -96,6 +96,12 @@ impl ComputedTextBlock {
pub fn buffer(&self) -> &CosmicBuffer { pub fn buffer(&self) -> &CosmicBuffer {
&self.buffer &self.buffer
} }
/// Flag the text block for rerendering.
/// Automatically unset
pub fn set_needs_rerender(&mut self) {
self.needs_rerender = true;
}
} }
impl Default for ComputedTextBlock { impl Default for ComputedTextBlock {

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

@ -33,15 +33,12 @@ use tracing::error;
pub struct TextNodeFlags { pub struct TextNodeFlags {
/// If set then a new measure function for the text node will be created. /// If set then a new measure function for the text node will be created.
needs_measure_fn: bool, needs_measure_fn: bool,
/// If set then the text will be recomputed.
needs_recompute: bool,
} }
impl Default for TextNodeFlags { impl Default for TextNodeFlags {
fn default() -> Self { fn default() -> Self {
Self { Self {
needs_measure_fn: true, needs_measure_fn: true,
needs_recompute: true,
} }
} }
} }
@ -223,7 +220,7 @@ fn create_text_measure<'a>(
// Text measure func created successfully, so set `TextNodeFlags` to schedule a recompute // Text measure func created successfully, so set `TextNodeFlags` to schedule a recompute
text_flags.needs_measure_fn = false; text_flags.needs_measure_fn = false;
text_flags.needs_recompute = true; computed.set_needs_rerender();
} }
Err(TextError::NoSuchFont) => { Err(TextError::NoSuchFont) => {
// Try again next frame // Try again next frame
@ -334,7 +331,7 @@ fn queue_text(
) { ) {
Err(TextError::NoSuchFont) => { Err(TextError::NoSuchFont) => {
// There was an error processing the text layout, try again next frame // There was an error processing the text layout, try again next frame
text_flags.needs_recompute = true; computed.set_needs_rerender();
} }
Err(e @ (TextError::FailedToAddGlyph(_) | TextError::FailedToGetGlyphImage(_))) => { Err(e @ (TextError::FailedToAddGlyph(_) | TextError::FailedToGetGlyphImage(_))) => {
panic!("Fatal error when processing text: {e}."); panic!("Fatal error when processing text: {e}.");
@ -342,7 +339,6 @@ fn queue_text(
Ok(()) => { Ok(()) => {
text_layout_info.size.x = scale_value(text_layout_info.size.x, inverse_scale_factor); text_layout_info.size.x = scale_value(text_layout_info.size.x, inverse_scale_factor);
text_layout_info.size.y = scale_value(text_layout_info.size.y, inverse_scale_factor); text_layout_info.size.y = scale_value(text_layout_info.size.y, inverse_scale_factor);
text_flags.needs_recompute = false;
} }
} }
} }
@ -374,7 +370,7 @@ pub fn text_system(
mut swash_cache: ResMut<SwashCache>, mut swash_cache: ResMut<SwashCache>,
) { ) {
for (entity, node, block, text_layout_info, text_flags, mut computed) in &mut text_query { for (entity, node, block, text_layout_info, text_flags, mut computed) in &mut text_query {
if node.is_changed() || text_flags.needs_recompute { if node.is_changed() || computed.needs_rerender() {
queue_text( queue_text(
entity, entity,
&fonts, &fonts,