Mirrors/bevy
2
0
Fork 0
mirror of https://github.com/bevyengine/bevy synced 2024-11-30 00:20:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

measure_text_system text query fix (#8466)

Browse source 
# Objective

The first query of `measure_text_system`'s `text_queries` `ParamSet`
queries for all changed `Text` meaning that non-UI `Text` entities could
be added to its queue.

## Solution

Add a `With<Node>` query filter.

---

## Changelog
changes:
* Added a `With<Node>` query filter to first query of
`measure_text_system`'s `text_queries` `ParamSet` to ensure that only UI
node entities are added to its local queue.
* Fixed comment (text is not computed on changes to style).
This commit is contained in:
ickshonpe 2023-04-22 22:30:38 +01:00 committed by GitHub
parent 15a96adc01
commit 4580a91171
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -68,7 +68,7 @@ pub fn measure_text_system(
ui_scale: Res<UiScale>, ui_scale: Res<UiScale>,
mut text_pipeline: ResMut<TextPipeline>, mut text_pipeline: ResMut<TextPipeline>,
mut text_queries: ParamSet<( mut text_queries: ParamSet<(
Query<Entity, Changed<Text>>, Query<Entity, (Changed<Text>, With<Node>)>,
Query<Entity, (With<Text>, With<Node>)>, Query<Entity, (With<Text>, With<Node>)>,
Query<(&Text, &mut CalculatedSize)>, Query<(&Text, &mut CalculatedSize)>,
)>, )>,
@ -82,7 +82,7 @@ pub fn measure_text_system(
#[allow(clippy::float_cmp)] #[allow(clippy::float_cmp)]
if *last_scale_factor == scale_factor { if *last_scale_factor == scale_factor {
// Adds all entities where the text or the style has changed to the local queue // Adds all entities where the text has changed to the local queue
for entity in text_queries.p0().iter() { for entity in text_queries.p0().iter() {
if !queued_text.contains(&entity) { if !queued_text.contains(&entity) {
queued_text.push(entity); queued_text.push(entity);