From 1ce08d4278bba9bd18ea31167a01850f6d5b1cd3 Mon Sep 17 00:00:00 2001
From: Nico Burns <nico@nicoburns.com>
Date: Mon, 17 Apr 2023 18:13:22 +0100
Subject: [PATCH] Fix text systems broken during merge conflict fixing

---
 crates/bevy_ui/src/lib.rs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/crates/bevy_ui/src/lib.rs b/crates/bevy_ui/src/lib.rs
index 38d583740a127..ef92291ac4628 100644
--- a/crates/bevy_ui/src/lib.rs
+++ b/crates/bevy_ui/src/lib.rs
@@ -122,11 +122,11 @@ impl Plugin for UiPlugin {
         #[cfg(feature = "bevy_text")]
         app.add_systems(
             PostUpdate,
-            widget::text_system
+            widget::measure_text_system
                 .before(UiSystem::Layout)
                 // Potential conflict: `Assets<Image>`
                 // In practice, they run independently since `bevy_render::camera_update_system`
-                // will only ever observe its own render target, and `widget::text_system`
+                // will only ever observe its own render target, and `widget::measure_text_system`
                 // will never modify a pre-existing `Image` asset.
                 .ambiguous_with(CameraUpdateSystem)
                 // Potential conflict: `Assets<Image>`
@@ -157,6 +157,7 @@ impl Plugin for UiPlugin {
                     .before(TransformSystem::TransformPropagate),
                 ui_stack_system.in_set(UiSystem::Stack),
                 update_clipping_system.after(TransformSystem::TransformPropagate),
+                widget::text_system.after(UiSystem::Layout),
             ),
         );