From 3ed0c11d391450f879753472f99f77a5f3c9248e Mon Sep 17 00:00:00 2001 From: marius david Date: Thu, 19 Nov 2020 15:25:02 +0100 Subject: [PATCH 1/2] do not draw text with is_visible = false --- crates/bevy_ui/src/widget/text.rs | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/crates/bevy_ui/src/widget/text.rs b/crates/bevy_ui/src/widget/text.rs index c2dc9113c1540..ec7ece76b99db 100644 --- a/crates/bevy_ui/src/widget/text.rs +++ b/crates/bevy_ui/src/widget/text.rs @@ -153,20 +153,22 @@ pub fn draw_text_system( let vertex_buffer_descriptor = font_quad.get_vertex_buffer_descriptor(); for (entity, mut draw, text, node, global_transform) in query.iter_mut() { - if let Some(text_glyphs) = text_pipeline.get_glyphs(&entity) { - let position = global_transform.translation - (node.size / 2.0).extend(0.0); + if draw.is_visible { + if let Some(text_glyphs) = text_pipeline.get_glyphs(&entity) { + let position = global_transform.translation - (node.size / 2.0).extend(0.0); - let mut drawable_text = DrawableText { - render_resource_bindings: &mut render_resource_bindings, - asset_render_resource_bindings: &mut asset_render_resource_bindings, - position, - msaa: &msaa, - text_glyphs: &text_glyphs.glyphs, - font_quad_vertex_descriptor: &vertex_buffer_descriptor, - style: &text.style, - }; + let mut drawable_text = DrawableText { + render_resource_bindings: &mut render_resource_bindings, + asset_render_resource_bindings: &mut asset_render_resource_bindings, + position, + msaa: &msaa, + text_glyphs: &text_glyphs.glyphs, + font_quad_vertex_descriptor: &vertex_buffer_descriptor, + style: &text.style, + }; - drawable_text.draw(&mut draw, &mut context).unwrap(); + drawable_text.draw(&mut draw, &mut context).unwrap(); + } } } } From b68a63f85df28fe21dc909a48e41b80667459e20 Mon Sep 17 00:00:00 2001 From: Carter Anderson Date: Sat, 21 Nov 2020 13:53:39 -0800 Subject: [PATCH 2/2] small style change --- crates/bevy_ui/src/widget/text.rs | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/crates/bevy_ui/src/widget/text.rs b/crates/bevy_ui/src/widget/text.rs index ec7ece76b99db..736675dee4186 100644 --- a/crates/bevy_ui/src/widget/text.rs +++ b/crates/bevy_ui/src/widget/text.rs @@ -153,22 +153,24 @@ pub fn draw_text_system( let vertex_buffer_descriptor = font_quad.get_vertex_buffer_descriptor(); for (entity, mut draw, text, node, global_transform) in query.iter_mut() { - if draw.is_visible { - if let Some(text_glyphs) = text_pipeline.get_glyphs(&entity) { - let position = global_transform.translation - (node.size / 2.0).extend(0.0); + if !draw.is_visible { + continue; + } - let mut drawable_text = DrawableText { - render_resource_bindings: &mut render_resource_bindings, - asset_render_resource_bindings: &mut asset_render_resource_bindings, - position, - msaa: &msaa, - text_glyphs: &text_glyphs.glyphs, - font_quad_vertex_descriptor: &vertex_buffer_descriptor, - style: &text.style, - }; + if let Some(text_glyphs) = text_pipeline.get_glyphs(&entity) { + let position = global_transform.translation - (node.size / 2.0).extend(0.0); - drawable_text.draw(&mut draw, &mut context).unwrap(); - } + let mut drawable_text = DrawableText { + render_resource_bindings: &mut render_resource_bindings, + asset_render_resource_bindings: &mut asset_render_resource_bindings, + position, + msaa: &msaa, + text_glyphs: &text_glyphs.glyphs, + font_quad_vertex_descriptor: &vertex_buffer_descriptor, + style: &text.style, + }; + + drawable_text.draw(&mut draw, &mut context).unwrap(); } } }