fixes content size scaling

Author: RobertBrewitz

CHANGELOG.md

@@ -22,7 +22,7 @@ This release supports Bevy version 0.16 and has an [MSRV][] of 1.87.
 - Adds `NoVelloScale` component to disable scaling for specific entities.
 - Adds `VelloScreenSpace` component.
 - Adds `VelloScreenSpace` to `bevy_vello::prelude`.
-- Adds `calculate_text_content_size` system that calculates the content size of `VelloTextSection` if it has a `ContentSize` component.
+- Adds functionality that automatically calculates the content size of `VelloTextSection` if it has a `ContentSize` component which is also `VelloScreenScale` aware.
 
 ### Changed
 

src/integrations/text/plugin.rs

@@ -4,9 +4,14 @@ use bevy::{
 };
 
 use super::{
-    VelloFont, font_loader::VelloFontLoader, render, vello_text::calculate_text_content_size,
+    VelloFont,
+    font_loader::VelloFontLoader,
+    render,
+    vello_text::{
+        calculate_text_section_content_size, calculate_text_section_content_size_on_change,
+    },
 };
-use crate::render::extract::VelloExtractStep;
+use crate::render::{VelloScreenScale, extract::VelloExtractStep};
 
 pub struct VelloTextIntegrationPlugin;
 
@@ -15,7 +20,11 @@ impl Plugin for VelloTextIntegrationPlugin {
         app.init_asset::<VelloFont>()
             .init_asset_loader::<VelloFontLoader>()
             .add_plugins(RenderAssetPlugin::<VelloFont>::default())
-            .add_systems(Update, calculate_text_content_size);
+            .add_systems(Update, calculate_text_section_content_size_on_change)
+            .add_systems(
+                Update,
+                calculate_text_section_content_size.run_if(resource_changed::<VelloScreenScale>),
+            );
 
         #[cfg(feature = "default_font")]
         {

src/integrations/text/vello_text.rs

@@ -1,11 +1,16 @@
+use std::ops::Mul;
+
 use bevy::{
     prelude::*,
     render::view::{self, VisibilityClass},
     ui::{ContentSize, NodeMeasure},
 };
 use vello::peniko::{self, Brush};
 
-use crate::{VelloFont, render::VelloView};
+use crate::{
+    VelloFont,
+    render::{VelloScreenScale, VelloView},
+};
 
 #[derive(Component, Default, Clone)]
 #[require(VelloTextAnchor, Transform, Visibility, VisibilityClass)]
@@ -224,13 +229,43 @@ impl VelloTextSection {
     }
 }
 
-pub fn calculate_text_content_size(
+pub fn calculate_text_section_content_size_on_change(
     mut button_q: Query<
         (&mut ContentSize, &mut VelloTextSection, &GlobalTransform),
         Changed<VelloTextSection>,
     >,
     camera: Single<(&Camera, &GlobalTransform), With<VelloView>>,
     fonts: Res<Assets<VelloFont>>,
+    screen_scale: Res<VelloScreenScale>,
+) {
+    let (camera, camera_transform) = *camera;
+
+    for (mut cs, text, gtransform) in button_q.iter_mut() {
+        if let Some(rect) = text.bb_in_screen_space(
+            fonts.get(&text.style.font).unwrap(),
+            gtransform,
+            camera,
+            camera_transform,
+        ) {
+            let size = rect.size();
+            let width = text.width.unwrap_or(size.x.abs().mul(screen_scale.0));
+            let height = text.height.unwrap_or(size.y.abs().mul(screen_scale.0));
+            let measure = NodeMeasure::Fixed(bevy::ui::FixedMeasure {
+                size: Vec2::new(width, height),
+            });
+            cs.set(measure);
+        }
+    }
+}
+
+pub fn calculate_text_section_content_size(
+    mut button_q: Query<
+        (&mut ContentSize, &mut VelloTextSection, &GlobalTransform),
+        With<VelloTextSection>,
+    >,
+    camera: Single<(&Camera, &GlobalTransform), With<VelloView>>,
+    fonts: Res<Assets<VelloFont>>,
+    screen_scale: Res<VelloScreenScale>,
 ) {
     let (camera, camera_transform) = *camera;
 
@@ -242,8 +277,8 @@ pub fn calculate_text_content_size(
             camera_transform,
         ) {
             let size = rect.size();
-            let width = text.width.unwrap_or(size.x.abs());
-            let height = text.height.unwrap_or(size.y.abs());
+            let width = text.width.unwrap_or(size.x.abs().mul(screen_scale.0));
+            let height = text.height.unwrap_or(size.y.abs().mul(screen_scale.0));
             let measure = NodeMeasure::Fixed(bevy::ui::FixedMeasure {
                 size: Vec2::new(width, height),
             });