rebase fixes

Author: UkoeHB

crates/bevy_text/src/text2d.rs

@@ -17,8 +17,8 @@ use bevy_ecs::{
     system::{Commands, Local, Query, Res, ResMut},
 };
 use bevy_math::Vec2;
-use bevy_render::sync_world::TemporaryRenderEntity;
 use bevy_reflect::{prelude::ReflectDefault, Reflect};
+use bevy_render::sync_world::TemporaryRenderEntity;
 use bevy_render::view::Visibility;
 use bevy_render::{
     primitives::Aabb,

crates/bevy_ui/src/render/mod.rs

@@ -655,7 +655,7 @@ pub fn extract_text_sections(
                 atlas_info,
                 span_index,
                 ..
-            }
+            },
         ) in text_layout_info.glyphs.iter().enumerate()
         {
             if *span_index != current_span {
@@ -687,8 +687,7 @@ pub fn extract_text_sections(
                 .glyphs
                 .get(i + 1)
                 .map(|info| {
-                    info.section_index != *section_index
-                        || info.atlas_info.texture != atlas_info.texture
+                    info.span_index != current_span || info.atlas_info.texture != atlas_info.texture
                 })
                 .unwrap_or(true)
             {
@@ -698,7 +697,7 @@ pub fn extract_text_sections(
                     id,
                     ExtractedUiNode {
                         stack_index: uinode.stack_index,
-                        color: LinearRgba::from(text.sections[*section_index].style.color),
+                        color,
                         image: atlas_info.texture.id(),
                         clip: clip.map(|clip| clip.clip),
                         camera_entity: render_camera_entity.id(),

examples/ui/text_debug.rs

@@ -95,8 +95,9 @@ fn infotext_system(mut commands: Commands, asset_server: Res<AssetServer>) {
             Style {
                 max_width: Val::Px(300.),
                 ..default()
-            })
-            .with_background_color(background_color)
+            },
+            BackgroundColor(background_color)
+        )
         );
     }).id();
 
@@ -124,8 +125,7 @@ fn infotext_system(mut commands: Commands, asset_server: Res<AssetServer>) {
             Style {
                 max_width: Val::Px(400.),
                 ..default()
-            })
-            .with_background_color(background_color)
+            },BackgroundColor(background_color))
         );
 
         builder.spawn((Text::new(
@@ -144,22 +144,6 @@ fn infotext_system(mut commands: Commands, asset_server: Res<AssetServer>) {
             BackgroundColor(background_color)
         ));
 
-        builder.spawn((
-            Text::new( "This text is fully justified and is positioned in the same way."),
-            TextStyle {
-                font: font.clone(),
-                font_size: 29.0,
-                color: GREEN_YELLOW.into(),
-                ..default()
-            },
-            TextBlock::new_with_justify(JustifyText::Justified),
-            Style {
-                max_width: Val::Px(300.),
-                ..default()
-            },
-            BackgroundColor(background_color)
-        ));
-
         builder.spawn((
             Text::new("This text is fully justified and is positioned in the same way."),
             TextStyle {