Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Merged by Bors] - Remove QueuedText #7414

Closed
wants to merge 1 commit into from
Closed

[Merged by Bors] - Remove QueuedText #7414

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 6 additions & 11 deletions crates/bevy_ui/src/widget/text.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,6 @@ use bevy_text::{
};
use bevy_window::{PrimaryWindow, Window};

#[derive(Debug, Default)]
pub struct QueuedText {
entities: Vec<Entity>,
}

fn scale_value(value: f32, factor: f64) -> f32 {
(value as f64 * factor) as f32
}
Expand Down Expand Up @@ -47,7 +42,7 @@ pub fn text_constraint(min_size: Val, size: Val, max_size: Val, scale_factor: f6
#[allow(clippy::too_many_arguments)]
pub fn text_system(
mut commands: Commands,
mut queued_text: Local<QueuedText>,
mut queued_text_ids: Local<Vec<Entity>>,
mut last_scale_factor: Local<f64>,
mut textures: ResMut<Assets<Image>>,
fonts: Res<Assets<Font>>,
Expand Down Expand Up @@ -81,24 +76,24 @@ pub fn text_system(
if *last_scale_factor == scale_factor {
// Adds all entities where the text or the style has changed to the local queue
for entity in text_queries.p0().iter() {
queued_text.entities.push(entity);
queued_text_ids.push(entity);
}
} else {
// If the scale factor has changed, queue all text
for entity in text_queries.p1().iter() {
queued_text.entities.push(entity);
queued_text_ids.push(entity);
}
*last_scale_factor = scale_factor;
}

if queued_text.entities.is_empty() {
if queued_text_ids.is_empty() {
return;
}

// Computes all text in the local queue
let mut new_queue = Vec::new();
let mut query = text_queries.p2();
for entity in queued_text.entities.drain(..) {
for entity in queued_text_ids.drain(..) {
if let Ok((text, style, mut calculated_size, text_layout_info)) = query.get_mut(entity) {
let node_size = Vec2::new(
text_constraint(
Expand Down Expand Up @@ -153,5 +148,5 @@ pub fn text_system(
}
}

queued_text.entities = new_queue;
*queued_text_ids = new_queue;
}