forestia/bevy
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix text systems broken when resolving merge conflicts in #8026 (#8422)

Browse Source 
# Objective

- Incorrectly resolved merge conflicts in
https://github.com/bevyengine/bevy/pull/8026 have caused UI text to not
render at all.

## Solution

Restore correct system schedule for text systems
This commit is contained in:
Nico Burns 2023-04-17 18:29:44 +01:00 committed by GitHub
parent 363d0f0c7c
commit fe0ad10b0c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
crates/bevy_ui/src/lib.rs
View File

@ -122,11 +122,11 @@ impl Plugin for UiPlugin {
#[cfg(feature = "bevy_text")] #[cfg(feature = "bevy_text")]
app.add_systems( app.add_systems(
PostUpdate, PostUpdate,
widget::text_system widget::measure_text_system
.before(UiSystem::Layout) .before(UiSystem::Layout)
// Potential conflict: `Assets<Image>` // Potential conflict: `Assets<Image>`
// In practice, they run independently since `bevy_render::camera_update_system` // 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. // will never modify a pre-existing `Image` asset.
.ambiguous_with(CameraUpdateSystem) .ambiguous_with(CameraUpdateSystem)
// Potential conflict: `Assets<Image>` // Potential conflict: `Assets<Image>`
@ -157,6 +157,7 @@ impl Plugin for UiPlugin {
.before(TransformSystem::TransformPropagate), .before(TransformSystem::TransformPropagate),
ui_stack_system.in_set(UiSystem::Stack), ui_stack_system.in_set(UiSystem::Stack),
update_clipping_system.after(TransformSystem::TransformPropagate), update_clipping_system.after(TransformSystem::TransformPropagate),
widget::text_system.after(UiSystem::Layout),
), ),
); );