From 2b602a65864f8791f59af7eaaf9baa1dbb9ea97b Mon Sep 17 00:00:00 2001
From: ickshonpe <david.curthoys@googlemail.com>
Date: Mon, 25 Sep 2023 23:16:27 +0100
Subject: [PATCH 1/8] Text bounds are computed by the layout algorithm and
 measure func so that given whatever the constraints are text will only wrap
 after it's used the maximum amount of available horizontal space.

However then when the layout size is returned, before the Node size is set the layout coordinates are rounded, sometimes changing the size of the Node. This means that the text may no longer fit the horizontal available space and wrap onto a new line. But since the layout algorithm hasn't alloted any vertical space for this new line, the text on this new line dissappears.

The commit adds a flag `no_rounding` to `ContentSize` that tells the layout algorithm not to round the size of the node, avoiding this problem.

Rounding is used eliminate pixel wide gaps between nodes that should be touching edge to edge, but this isn't necessary for text nodes as they don't have solid edges.
---
 crates/bevy_ui/src/layout/mod.rs  | 33 +++++++++++++++++++------------
 crates/bevy_ui/src/measurement.rs | 18 +++++++++++++++++
 crates/bevy_ui/src/widget/text.rs |  4 ++--
 3 files changed, 40 insertions(+), 15 deletions(-)

diff --git a/crates/bevy_ui/src/layout/mod.rs b/crates/bevy_ui/src/layout/mod.rs
index 90603577b1d65..363d83718774c 100644
--- a/crates/bevy_ui/src/layout/mod.rs
+++ b/crates/bevy_ui/src/layout/mod.rs
@@ -8,7 +8,7 @@ use bevy_ecs::{
     event::EventReader,
     query::{With, Without},
     removal_detection::RemovedComponents,
-    system::{Query, Res, ResMut, Resource},
+    system::{Query, Res, ResMut, Resource, ParamSet},
     world::Ref,
 };
 use bevy_hierarchy::{Children, Parent};
@@ -245,12 +245,14 @@ pub fn ui_layout_system(
     mut ui_surface: ResMut<UiSurface>,
     root_node_query: Query<Entity, (With<Node>, Without<Parent>)>,
     style_query: Query<(Entity, Ref<Style>), With<Node>>,
-    mut measure_query: Query<(Entity, &mut ContentSize)>,
     children_query: Query<(Entity, Ref<Children>), With<Node>>,
     just_children_query: Query<&Children>,
     mut removed_children: RemovedComponents<Children>,
     mut removed_content_sizes: RemovedComponents<ContentSize>,
-    mut node_transform_query: Query<(&mut Node, &mut Transform)>,
+    mut mutables_param_set: ParamSet<(
+        Query<(Entity, &mut ContentSize)>,
+        Query<(&mut Node, &mut Transform, Option<&ContentSize>)>,
+    )>,
     mut removed_nodes: RemovedComponents<Node>,
 ) {
     // assume one window for time being...
@@ -296,7 +298,7 @@ pub fn ui_layout_system(
         ui_surface.try_remove_measure(entity);
     }
 
-    for (entity, mut content_size) in &mut measure_query {
+    for (entity, mut content_size) in &mut mutables_param_set.p0() {
         if let Some(measure_func) = content_size.measure_func.take() {
             ui_surface.update_measure(entity, measure_func);
         }
@@ -328,13 +330,13 @@ pub fn ui_layout_system(
     fn update_uinode_geometry_recursive(
         entity: Entity,
         ui_surface: &UiSurface,
-        node_transform_query: &mut Query<(&mut Node, &mut Transform)>,
+        node_transform_query: &mut Query<(&mut Node, &mut Transform, Option<&ContentSize>)>,
         children_query: &Query<&Children>,
         inverse_target_scale_factor: f32,
         parent_size: Vec2,
         mut absolute_location: Vec2,
     ) {
-        if let Ok((mut node, mut transform)) = node_transform_query.get_mut(entity) {
+        if let Ok((mut node, mut transform, maybe_content_size)) = node_transform_query.get_mut(entity) {
             let layout = ui_surface.get_layout(entity).unwrap();
             let layout_size =
                 inverse_target_scale_factor * Vec2::new(layout.size.width, layout.size.height);
@@ -342,14 +344,19 @@ pub fn ui_layout_system(
                 inverse_target_scale_factor * Vec2::new(layout.location.x, layout.location.y);
 
             absolute_location += layout_location;
-            let rounded_size = round_layout_coords(absolute_location + layout_size)
-                - round_layout_coords(absolute_location);
+            
+            let size = if maybe_content_size.map(|content_size| content_size.no_rounding()).unwrap_or_default() {
+                layout_size
+            } else {
+                round_layout_coords(absolute_location + layout_size) - round_layout_coords(absolute_location)
+            };
+
             let rounded_location =
-                round_layout_coords(layout_location) + 0.5 * (rounded_size - parent_size);
+                round_layout_coords(layout_location) + 0.5 * (size - parent_size);
 
             // only trigger change detection when the new values are different
-            if node.calculated_size != rounded_size {
-                node.calculated_size = rounded_size;
+            if node.calculated_size != size {
+                node.calculated_size = size;
             }
             if transform.translation.truncate() != rounded_location {
                 transform.translation = rounded_location.extend(0.);
@@ -362,7 +369,7 @@ pub fn ui_layout_system(
                         node_transform_query,
                         children_query,
                         inverse_target_scale_factor,
-                        rounded_size,
+                        size,
                         absolute_location,
                     );
                 }
@@ -374,7 +381,7 @@ pub fn ui_layout_system(
         update_uinode_geometry_recursive(
             entity,
             &ui_surface,
-            &mut node_transform_query,
+        &mut mutables_param_set.p1(),
             &just_children_query,
             inverse_target_scale_factor as f32,
             Vec2::ZERO,
diff --git a/crates/bevy_ui/src/measurement.rs b/crates/bevy_ui/src/measurement.rs
index 1457dd6a3af8d..fb1fedbdd217f 100644
--- a/crates/bevy_ui/src/measurement.rs
+++ b/crates/bevy_ui/src/measurement.rs
@@ -52,6 +52,7 @@ pub struct ContentSize {
     /// The `Measure` used to compute the intrinsic size
     #[reflect(ignore)]
     pub(crate) measure_func: Option<MeasureFunc>,
+    pub(crate) no_rounding: bool,
 }
 
 impl ContentSize {
@@ -67,10 +68,27 @@ impl ContentSize {
         self.measure_func = Some(MeasureFunc::Boxed(Box::new(measure_func)));
     }
 
+    /// Set a `Measure` for the UI node entity with this component
+    pub fn set_unrounded(&mut self, measure: impl Measure) {
+        let measure_func = move |size: TaffySize<_>, available: TaffySize<_>| {
+            let size = measure.measure(size.width, size.height, available.width, available.height);
+            TaffySize {
+                width: size.x,
+                height: size.y,
+            }
+        };
+        self.measure_func = Some(MeasureFunc::Boxed(Box::new(measure_func)));
+        self.no_rounding = true;
+    }
+
     /// Creates a `ContentSize` with a `Measure` that always returns given `size` argument, regardless of the UI layout's constraints.
     pub fn fixed_size(size: Vec2) -> ContentSize {
         let mut content_size = Self::default();
         content_size.set(FixedMeasure { size });
         content_size
     }
+
+    pub fn no_rounding(&self) -> bool {
+        self.no_rounding
+    }
 }
diff --git a/crates/bevy_ui/src/widget/text.rs b/crates/bevy_ui/src/widget/text.rs
index 9a400ed209147..23c5c5ebbe820 100644
--- a/crates/bevy_ui/src/widget/text.rs
+++ b/crates/bevy_ui/src/widget/text.rs
@@ -82,9 +82,9 @@ fn create_text_measure(
     match TextMeasureInfo::from_text(&text, fonts, scale_factor) {
         Ok(measure) => {
             if text.linebreak_behavior == BreakLineOn::NoWrap {
-                content_size.set(FixedMeasure { size: measure.max });
+                content_size.set_unrounded(FixedMeasure { size: measure.max });
             } else {
-                content_size.set(TextMeasure { info: measure });
+                content_size.set_unrounded(TextMeasure { info: measure });
             }
 
             // Text measure func created successfully, so set `TextFlags` to schedule a recompute

From 8996409609b07a4bbdf1972679c83715107db8e9 Mon Sep 17 00:00:00 2001
From: ickshonpe <david.curthoys@googlemail.com>
Date: Tue, 26 Sep 2023 01:11:07 +0100
Subject: [PATCH 2/8] cargo fmt --all

---
 crates/bevy_ui/src/layout/mod.rs | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/crates/bevy_ui/src/layout/mod.rs b/crates/bevy_ui/src/layout/mod.rs
index 363d83718774c..bce16c9a1c85a 100644
--- a/crates/bevy_ui/src/layout/mod.rs
+++ b/crates/bevy_ui/src/layout/mod.rs
@@ -8,7 +8,7 @@ use bevy_ecs::{
     event::EventReader,
     query::{With, Without},
     removal_detection::RemovedComponents,
-    system::{Query, Res, ResMut, Resource, ParamSet},
+    system::{ParamSet, Query, Res, ResMut, Resource},
     world::Ref,
 };
 use bevy_hierarchy::{Children, Parent};
@@ -336,7 +336,9 @@ pub fn ui_layout_system(
         parent_size: Vec2,
         mut absolute_location: Vec2,
     ) {
-        if let Ok((mut node, mut transform, maybe_content_size)) = node_transform_query.get_mut(entity) {
+        if let Ok((mut node, mut transform, maybe_content_size)) =
+            node_transform_query.get_mut(entity)
+        {
             let layout = ui_surface.get_layout(entity).unwrap();
             let layout_size =
                 inverse_target_scale_factor * Vec2::new(layout.size.width, layout.size.height);
@@ -344,11 +346,15 @@ pub fn ui_layout_system(
                 inverse_target_scale_factor * Vec2::new(layout.location.x, layout.location.y);
 
             absolute_location += layout_location;
-            
-            let size = if maybe_content_size.map(|content_size| content_size.no_rounding()).unwrap_or_default() {
+
+            let size = if maybe_content_size
+                .map(|content_size| content_size.no_rounding())
+                .unwrap_or_default()
+            {
                 layout_size
             } else {
-                round_layout_coords(absolute_location + layout_size) - round_layout_coords(absolute_location)
+                round_layout_coords(absolute_location + layout_size)
+                    - round_layout_coords(absolute_location)
             };
 
             let rounded_location =
@@ -381,7 +387,7 @@ pub fn ui_layout_system(
         update_uinode_geometry_recursive(
             entity,
             &ui_surface,
-        &mut mutables_param_set.p1(),
+            &mut mutables_param_set.p1(),
             &just_children_query,
             inverse_target_scale_factor as f32,
             Vec2::ZERO,

From 01dcd8e8c285a6f9ad3d02d5f95735b84d2946d8 Mon Sep 17 00:00:00 2001
From: ickshonpe <david.curthoys@googlemail.com>
Date: Tue, 26 Sep 2023 01:19:19 +0100
Subject: [PATCH 3/8] added doc  comments for new field

---
 crates/bevy_ui/src/measurement.rs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/crates/bevy_ui/src/measurement.rs b/crates/bevy_ui/src/measurement.rs
index fb1fedbdd217f..623028e3e1835 100644
--- a/crates/bevy_ui/src/measurement.rs
+++ b/crates/bevy_ui/src/measurement.rs
@@ -52,6 +52,7 @@ pub struct ContentSize {
     /// The `Measure` used to compute the intrinsic size
     #[reflect(ignore)]
     pub(crate) measure_func: Option<MeasureFunc>,
+    /// Whether the size of the node should be rounded after layout recomputation
     pub(crate) no_rounding: bool,
 }
 
@@ -88,6 +89,7 @@ impl ContentSize {
         content_size
     }
 
+    /// Returns true if this node's size should not be rounded after layout recomputation
     pub fn no_rounding(&self) -> bool {
         self.no_rounding
     }

From 20c760bd0a9fa237c860495e5997acf2048469bd Mon Sep 17 00:00:00 2001
From: ickshonpe <david.curthoys@googlemail.com>
Date: Tue, 26 Sep 2023 12:12:30 +0100
Subject: [PATCH 4/8] Added a `SizeRounding` enum with `Enabled` and `Disabled`
 variants.

Renamed the `no_rounding` field to `rounding` and changed its type to `SizeRounding`.
---
 crates/bevy_ui/src/layout/mod.rs  | 13 ++++---------
 crates/bevy_ui/src/measurement.rs | 23 ++++++++++++++---------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/crates/bevy_ui/src/layout/mod.rs b/crates/bevy_ui/src/layout/mod.rs
index bce16c9a1c85a..5a6590eb97ac0 100644
--- a/crates/bevy_ui/src/layout/mod.rs
+++ b/crates/bevy_ui/src/layout/mod.rs
@@ -1,7 +1,7 @@
 mod convert;
 pub mod debug;
 
-use crate::{ContentSize, Node, Style, UiScale};
+use crate::{ContentSize, Node, Style, UiScale, SizeRounding};
 use bevy_ecs::{
     change_detection::DetectChanges,
     entity::Entity,
@@ -347,14 +347,9 @@ pub fn ui_layout_system(
 
             absolute_location += layout_location;
 
-            let size = if maybe_content_size
-                .map(|content_size| content_size.no_rounding())
-                .unwrap_or_default()
-            {
-                layout_size
-            } else {
-                round_layout_coords(absolute_location + layout_size)
-                    - round_layout_coords(absolute_location)
+            let size = match maybe_content_size.map(|content_size| content_size.rounding).unwrap_or_default() {
+                SizeRounding::Enabled => round_layout_coords(absolute_location + layout_size) - round_layout_coords(absolute_location),
+                SizeRounding::Disabled => layout_size,
             };
 
             let rounded_location =
diff --git a/crates/bevy_ui/src/measurement.rs b/crates/bevy_ui/src/measurement.rs
index 623028e3e1835..048b540f2f447 100644
--- a/crates/bevy_ui/src/measurement.rs
+++ b/crates/bevy_ui/src/measurement.rs
@@ -12,6 +12,16 @@ impl std::fmt::Debug for ContentSize {
     }
 }
 
+/// Determines if the size of a UI node should be rounded
+#[derive(Copy, Clone, PartialEq, Eq, Debug, Default, Reflect)]
+pub enum SizeRounding {
+    /// The node's size should be rounded after layout recomputation
+    #[default]
+    Enabled,
+    /// The node's size should be not rounded after layout recomputation
+    Disabled,
+}
+
 /// A `Measure` is used to compute the size of a ui node
 /// when the size of that node is based on its content.
 pub trait Measure: Send + Sync + 'static {
@@ -52,8 +62,8 @@ pub struct ContentSize {
     /// The `Measure` used to compute the intrinsic size
     #[reflect(ignore)]
     pub(crate) measure_func: Option<MeasureFunc>,
-    /// Whether the size of the node should be rounded after layout recomputation
-    pub(crate) no_rounding: bool,
+    /// Determines if the size of the UI node with this `ContentSize` should be rounded after layout recomputation
+    pub(crate) rounding: SizeRounding,
 }
 
 impl ContentSize {
@@ -69,7 +79,7 @@ impl ContentSize {
         self.measure_func = Some(MeasureFunc::Boxed(Box::new(measure_func)));
     }
 
-    /// Set a `Measure` for the UI node entity with this component
+    /// Set a `Measure` for the UI node entity with this component with size rounding disabled
     pub fn set_unrounded(&mut self, measure: impl Measure) {
         let measure_func = move |size: TaffySize<_>, available: TaffySize<_>| {
             let size = measure.measure(size.width, size.height, available.width, available.height);
@@ -79,7 +89,7 @@ impl ContentSize {
             }
         };
         self.measure_func = Some(MeasureFunc::Boxed(Box::new(measure_func)));
-        self.no_rounding = true;
+        self.rounding = SizeRounding::Disabled;
     }
 
     /// Creates a `ContentSize` with a `Measure` that always returns given `size` argument, regardless of the UI layout's constraints.
@@ -88,9 +98,4 @@ impl ContentSize {
         content_size.set(FixedMeasure { size });
         content_size
     }
-
-    /// Returns true if this node's size should not be rounded after layout recomputation
-    pub fn no_rounding(&self) -> bool {
-        self.no_rounding
-    }
 }

From 0da99d8137a2ea4022b46c2630f70259b67c9cdc Mon Sep 17 00:00:00 2001
From: ickshonpe <david.curthoys@googlemail.com>
Date: Tue, 26 Sep 2023 12:39:22 +0100
Subject: [PATCH 5/8] cargo fmt

---
 crates/bevy_ui/src/layout/mod.rs | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/crates/bevy_ui/src/layout/mod.rs b/crates/bevy_ui/src/layout/mod.rs
index 5a6590eb97ac0..e548782c6f6ea 100644
--- a/crates/bevy_ui/src/layout/mod.rs
+++ b/crates/bevy_ui/src/layout/mod.rs
@@ -1,7 +1,7 @@
 mod convert;
 pub mod debug;
 
-use crate::{ContentSize, Node, Style, UiScale, SizeRounding};
+use crate::{ContentSize, Node, SizeRounding, Style, UiScale};
 use bevy_ecs::{
     change_detection::DetectChanges,
     entity::Entity,
@@ -347,8 +347,14 @@ pub fn ui_layout_system(
 
             absolute_location += layout_location;
 
-            let size = match maybe_content_size.map(|content_size| content_size.rounding).unwrap_or_default() {
-                SizeRounding::Enabled => round_layout_coords(absolute_location + layout_size) - round_layout_coords(absolute_location),
+            let size = match maybe_content_size
+                .map(|content_size| content_size.rounding)
+                .unwrap_or_default()
+            {
+                SizeRounding::Enabled => {
+                    round_layout_coords(absolute_location + layout_size)
+                        - round_layout_coords(absolute_location)
+                }
                 SizeRounding::Disabled => layout_size,
             };
 

From d085f62167dd0789f0d5b1e7fc205b2f460113b0 Mon Sep 17 00:00:00 2001
From: ickshonpe <david.curthoys@googlemail.com>
Date: Wed, 27 Sep 2023 17:47:38 +0100
Subject: [PATCH 6/8] Removed changes that made layout optional rounding.

Instead, store the both the unrounded and rounded sizes in `Node`.
---
 crates/bevy_ui/src/layout/mod.rs  | 41 +++++++++++--------------------
 crates/bevy_ui/src/measurement.rs | 25 -------------------
 crates/bevy_ui/src/ui_node.rs     | 10 ++++++++
 crates/bevy_ui/src/widget/text.rs |  9 ++++---
 4 files changed, 31 insertions(+), 54 deletions(-)

diff --git a/crates/bevy_ui/src/layout/mod.rs b/crates/bevy_ui/src/layout/mod.rs
index e548782c6f6ea..80c3aaec1b4a9 100644
--- a/crates/bevy_ui/src/layout/mod.rs
+++ b/crates/bevy_ui/src/layout/mod.rs
@@ -1,14 +1,14 @@
 mod convert;
 pub mod debug;
 
-use crate::{ContentSize, Node, SizeRounding, Style, UiScale};
+use crate::{ContentSize, Node, Style, UiScale};
 use bevy_ecs::{
     change_detection::DetectChanges,
     entity::Entity,
     event::EventReader,
     query::{With, Without},
     removal_detection::RemovedComponents,
-    system::{ParamSet, Query, Res, ResMut, Resource},
+    system::{Query, Res, ResMut, Resource},
     world::Ref,
 };
 use bevy_hierarchy::{Children, Parent};
@@ -245,14 +245,12 @@ pub fn ui_layout_system(
     mut ui_surface: ResMut<UiSurface>,
     root_node_query: Query<Entity, (With<Node>, Without<Parent>)>,
     style_query: Query<(Entity, Ref<Style>), With<Node>>,
+mut measure_query: Query<(Entity, &mut ContentSize)>,
     children_query: Query<(Entity, Ref<Children>), With<Node>>,
     just_children_query: Query<&Children>,
     mut removed_children: RemovedComponents<Children>,
     mut removed_content_sizes: RemovedComponents<ContentSize>,
-    mut mutables_param_set: ParamSet<(
-        Query<(Entity, &mut ContentSize)>,
-        Query<(&mut Node, &mut Transform, Option<&ContentSize>)>,
-    )>,
+    mut node_transform_query: Query<(&mut Node, &mut Transform)>,
     mut removed_nodes: RemovedComponents<Node>,
 ) {
     // assume one window for time being...
@@ -298,7 +296,7 @@ pub fn ui_layout_system(
         ui_surface.try_remove_measure(entity);
     }
 
-    for (entity, mut content_size) in &mut mutables_param_set.p0() {
+    for (entity, mut content_size) in &mut measure_query {
         if let Some(measure_func) = content_size.measure_func.take() {
             ui_surface.update_measure(entity, measure_func);
         }
@@ -330,15 +328,13 @@ pub fn ui_layout_system(
     fn update_uinode_geometry_recursive(
         entity: Entity,
         ui_surface: &UiSurface,
-        node_transform_query: &mut Query<(&mut Node, &mut Transform, Option<&ContentSize>)>,
+        node_transform_query: &mut Query<(&mut Node, &mut Transform)>,
         children_query: &Query<&Children>,
         inverse_target_scale_factor: f32,
         parent_size: Vec2,
         mut absolute_location: Vec2,
     ) {
-        if let Ok((mut node, mut transform, maybe_content_size)) =
-            node_transform_query.get_mut(entity)
-        {
+        if let Ok((mut node, mut transform)) = node_transform_query.get_mut(entity) {
             let layout = ui_surface.get_layout(entity).unwrap();
             let layout_size =
                 inverse_target_scale_factor * Vec2::new(layout.size.width, layout.size.height);
@@ -347,23 +343,16 @@ pub fn ui_layout_system(
 
             absolute_location += layout_location;
 
-            let size = match maybe_content_size
-                .map(|content_size| content_size.rounding)
-                .unwrap_or_default()
-            {
-                SizeRounding::Enabled => {
-                    round_layout_coords(absolute_location + layout_size)
-                        - round_layout_coords(absolute_location)
-                }
-                SizeRounding::Disabled => layout_size,
-            };
+            let rounded_size = round_layout_coords(absolute_location + layout_size)
+                - round_layout_coords(absolute_location);
 
             let rounded_location =
-                round_layout_coords(layout_location) + 0.5 * (size - parent_size);
+                round_layout_coords(layout_location) + 0.5 * (rounded_size - parent_size);
 
             // only trigger change detection when the new values are different
-            if node.calculated_size != size {
-                node.calculated_size = size;
+            if node.calculated_size != rounded_size || node.unrounded_size != layout_size {
+                node.calculated_size = rounded_size;
+                node.unrounded_size = layout_size;
             }
             if transform.translation.truncate() != rounded_location {
                 transform.translation = rounded_location.extend(0.);
@@ -376,7 +365,7 @@ pub fn ui_layout_system(
                         node_transform_query,
                         children_query,
                         inverse_target_scale_factor,
-                        size,
+                        rounded_size,
                         absolute_location,
                     );
                 }
@@ -388,7 +377,7 @@ pub fn ui_layout_system(
         update_uinode_geometry_recursive(
             entity,
             &ui_surface,
-            &mut mutables_param_set.p1(),
+            &mut node_transform_query,
             &just_children_query,
             inverse_target_scale_factor as f32,
             Vec2::ZERO,
diff --git a/crates/bevy_ui/src/measurement.rs b/crates/bevy_ui/src/measurement.rs
index 048b540f2f447..1457dd6a3af8d 100644
--- a/crates/bevy_ui/src/measurement.rs
+++ b/crates/bevy_ui/src/measurement.rs
@@ -12,16 +12,6 @@ impl std::fmt::Debug for ContentSize {
     }
 }
 
-/// Determines if the size of a UI node should be rounded
-#[derive(Copy, Clone, PartialEq, Eq, Debug, Default, Reflect)]
-pub enum SizeRounding {
-    /// The node's size should be rounded after layout recomputation
-    #[default]
-    Enabled,
-    /// The node's size should be not rounded after layout recomputation
-    Disabled,
-}
-
 /// A `Measure` is used to compute the size of a ui node
 /// when the size of that node is based on its content.
 pub trait Measure: Send + Sync + 'static {
@@ -62,8 +52,6 @@ pub struct ContentSize {
     /// The `Measure` used to compute the intrinsic size
     #[reflect(ignore)]
     pub(crate) measure_func: Option<MeasureFunc>,
-    /// Determines if the size of the UI node with this `ContentSize` should be rounded after layout recomputation
-    pub(crate) rounding: SizeRounding,
 }
 
 impl ContentSize {
@@ -79,19 +67,6 @@ impl ContentSize {
         self.measure_func = Some(MeasureFunc::Boxed(Box::new(measure_func)));
     }
 
-    /// Set a `Measure` for the UI node entity with this component with size rounding disabled
-    pub fn set_unrounded(&mut self, measure: impl Measure) {
-        let measure_func = move |size: TaffySize<_>, available: TaffySize<_>| {
-            let size = measure.measure(size.width, size.height, available.width, available.height);
-            TaffySize {
-                width: size.x,
-                height: size.y,
-            }
-        };
-        self.measure_func = Some(MeasureFunc::Boxed(Box::new(measure_func)));
-        self.rounding = SizeRounding::Disabled;
-    }
-
     /// Creates a `ContentSize` with a `Measure` that always returns given `size` argument, regardless of the UI layout's constraints.
     pub fn fixed_size(size: Vec2) -> ContentSize {
         let mut content_size = Self::default();
diff --git a/crates/bevy_ui/src/ui_node.rs b/crates/bevy_ui/src/ui_node.rs
index 14080c82228e0..143b725675130 100644
--- a/crates/bevy_ui/src/ui_node.rs
+++ b/crates/bevy_ui/src/ui_node.rs
@@ -17,6 +17,9 @@ pub struct Node {
     /// The size of the node as width and height in logical pixels
     /// automatically calculated by [`super::layout::ui_layout_system`]
     pub(crate) calculated_size: Vec2,
+    /// The unrounded size of the node as width and height in logical pixels
+    /// automatically calculated by [`super::layout::ui_layout_system`]
+    pub(crate) unrounded_size: Vec2,
 }
 
 impl Node {
@@ -26,6 +29,12 @@ impl Node {
         self.calculated_size
     }
 
+    /// The calculated node size as width and height in logical pixels before rounding
+    /// automatically calculated by [`super::layout::ui_layout_system`]
+    pub const fn unrounded_size(&self) -> Vec2 {
+        self.unrounded_size
+    }
+
     /// Returns the size of the node in physical pixels based on the given scale factor and `UiScale`.
     #[inline]
     pub fn physical_size(&self, scale_factor: f64, ui_scale: f64) -> Vec2 {
@@ -66,6 +75,7 @@ impl Node {
 impl Node {
     pub const DEFAULT: Self = Self {
         calculated_size: Vec2::ZERO,
+        unrounded_size: Vec2::ZERO,
     };
 }
 
diff --git a/crates/bevy_ui/src/widget/text.rs b/crates/bevy_ui/src/widget/text.rs
index 23c5c5ebbe820..5ff128ebb6f94 100644
--- a/crates/bevy_ui/src/widget/text.rs
+++ b/crates/bevy_ui/src/widget/text.rs
@@ -82,9 +82,9 @@ fn create_text_measure(
     match TextMeasureInfo::from_text(&text, fonts, scale_factor) {
         Ok(measure) => {
             if text.linebreak_behavior == BreakLineOn::NoWrap {
-                content_size.set_unrounded(FixedMeasure { size: measure.max });
+                content_size.set(FixedMeasure { size: measure.max });
             } else {
-                content_size.set_unrounded(TextMeasure { info: measure });
+                content_size.set(TextMeasure { info: measure });
             }
 
             // Text measure func created successfully, so set `TextFlags` to schedule a recompute
@@ -166,7 +166,10 @@ fn queue_text(
             Vec2::splat(f32::INFINITY)
         } else {
             // `scale_factor` is already multiplied by `UiScale`
-            node.physical_size(scale_factor, 1.)
+            Vec2::new(
+                (node.unrounded_size.x as f64 * scale_factor) as f32,
+                (node.unrounded_size.y as f64 * scale_factor) as f32,
+            )
         };
 
         match text_pipeline.queue_text(

From e28764198b901be3ca1396197c4117aa2f60e100 Mon Sep 17 00:00:00 2001
From: ickshonpe <david.curthoys@googlemail.com>
Date: Wed, 27 Sep 2023 18:11:58 +0100
Subject: [PATCH 7/8] cargo fmt

---
 crates/bevy_ui/src/layout/mod.rs | 2 +-
 examples/ui/text_wrap_debug.rs   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/crates/bevy_ui/src/layout/mod.rs b/crates/bevy_ui/src/layout/mod.rs
index 80c3aaec1b4a9..a8c5628d30766 100644
--- a/crates/bevy_ui/src/layout/mod.rs
+++ b/crates/bevy_ui/src/layout/mod.rs
@@ -245,7 +245,7 @@ pub fn ui_layout_system(
     mut ui_surface: ResMut<UiSurface>,
     root_node_query: Query<Entity, (With<Node>, Without<Parent>)>,
     style_query: Query<(Entity, Ref<Style>), With<Node>>,
-mut measure_query: Query<(Entity, &mut ContentSize)>,
+    mut measure_query: Query<(Entity, &mut ContentSize)>,
     children_query: Query<(Entity, Ref<Children>), With<Node>>,
     just_children_query: Query<&Children>,
     mut removed_children: RemovedComponents<Children>,
diff --git a/examples/ui/text_wrap_debug.rs b/examples/ui/text_wrap_debug.rs
index a7d01e3ab8e1e..46b66838e30ae 100644
--- a/examples/ui/text_wrap_debug.rs
+++ b/examples/ui/text_wrap_debug.rs
@@ -8,6 +8,7 @@ fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
         .insert_resource(WinitSettings::desktop_app())
+        .insert_resource(UiScale(4. / 3.))
         .add_systems(Startup, spawn)
         .run();
 }

From 3d766f792a0c3fd13819184168ab5b35fd62db20 Mon Sep 17 00:00:00 2001
From: ickshonpe <david.curthoys@googlemail.com>
Date: Thu, 28 Sep 2023 12:05:42 +0100
Subject: [PATCH 8/8] Update examples/ui/text_wrap_debug.rs

Co-authored-by: Rob Parrett <robparrett@gmail.com>
---
 examples/ui/text_wrap_debug.rs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/examples/ui/text_wrap_debug.rs b/examples/ui/text_wrap_debug.rs
index 46b66838e30ae..a7d01e3ab8e1e 100644
--- a/examples/ui/text_wrap_debug.rs
+++ b/examples/ui/text_wrap_debug.rs
@@ -8,7 +8,6 @@ fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
         .insert_resource(WinitSettings::desktop_app())
-        .insert_resource(UiScale(4. / 3.))
         .add_systems(Startup, spawn)
         .run();
 }