Be more explit about the width passed to layout being physical

Author: expenses

internal/core/textlayout/sharedparley.rs

@@ -6,7 +6,7 @@ pub use parley;
 use crate::{
     graphics::FontRequest,
     items::TextStrokeStyle,
-    lengths::LogicalLength,
+    lengths::{LogicalLength, PhysicalPx},
     textlayout::{TextHorizontalAlignment, TextOverflow, TextVerticalAlignment, TextWrap},
 };
 use i_slint_common::sharedfontique;
@@ -30,7 +30,7 @@ pub struct Brush {
 }
 
 pub struct LayoutOptions {
-    pub max_width: Option<LogicalLength>,
+    pub max_physical_width: Option<euclid::Length<crate::Coord, PhysicalPx>>,
     pub max_height: Option<LogicalLength>,
     pub horizontal_align: TextHorizontalAlignment,
     pub vertical_align: TextVerticalAlignment,
@@ -44,7 +44,7 @@ pub struct LayoutOptions {
 impl Default for LayoutOptions {
     fn default() -> Self {
         Self {
-            max_width: None,
+            max_physical_width: None,
             max_height: None,
             horizontal_align: TextHorizontalAlignment::Left,
             vertical_align: TextVerticalAlignment::Top,
@@ -109,10 +109,12 @@ pub fn layout(text: &str, scale_factor: f32, options: LayoutOptions) -> Layout {
         );
     }
 
+    let max_physical_width = options.max_physical_width.map(|max_width| max_width.get());
+    
     let mut layout: parley::Layout<Brush> = builder.build(text);
-    layout.break_all_lines(options.max_width.map(|max_width| max_width.get() * scale_factor));
+    layout.break_all_lines(max_physical_width);
     layout.align(
-        options.max_width.map(|max_width| max_width.get() * scale_factor),
+        max_physical_width,
         match options.horizontal_align {
             TextHorizontalAlignment::Left => parley::Alignment::Left,
             TextHorizontalAlignment::Center => parley::Alignment::Middle,

internal/renderers/femtovg/itemrenderer.rs

@@ -452,7 +452,7 @@ impl<'a, R: femtovg::Renderer + TextureImporter> ItemRenderer for GLItemRenderer
                 horizontal_align,
                 vertical_align,
                 max_height: Some(max_height),
-                max_width: Some(max_width),
+                max_physical_width: Some(max_width * self.scale_factor),
                 stroke: stroke_paint.is_some().then_some(stroke_style),
                 font_request: Some(font_request),
                 text_wrap: text.wrap(),
@@ -514,7 +514,7 @@ impl<'a, R: femtovg::Renderer + TextureImporter> ItemRenderer for GLItemRenderer
             &text,
             self.scale_factor.get(),
             sharedparley::LayoutOptions {
-                max_width: Some(width),
+                max_physical_width: Some(width * self.scale_factor),
                 max_height: Some(height),
                 vertical_align: text_input.vertical_alignment(),
                 selection: Some(min_select..max_select),

internal/renderers/femtovg/lib.rs

@@ -292,7 +292,7 @@ impl<B: GraphicsBackend> RendererSealed for FemtoVGRenderer<B> {
             text,
             scale_factor.get(),
             sharedparley::LayoutOptions {
-                max_width,
+                max_physical_width: max_width.map(|max_width| max_width * scale_factor),
                 text_wrap,
                 font_request: Some(font_request),
                 ..Default::default()
@@ -338,7 +338,7 @@ impl<B: GraphicsBackend> RendererSealed for FemtoVGRenderer<B> {
             scale_factor.get(),
             sharedparley::LayoutOptions {
                 font_request: Some(font_request),
-                max_width: Some(width),
+                max_physical_width: Some(width * scale_factor),
                 max_height: Some(height),
                 vertical_align: text_input.vertical_alignment(),
 
@@ -379,7 +379,7 @@ impl<B: GraphicsBackend> RendererSealed for FemtoVGRenderer<B> {
             &text,
             scale_factor.get(),
             sharedparley::LayoutOptions {
-                max_width: Some(width),
+                max_physical_width: Some(width * scale_factor),
                 max_height: Some(height),
                 ..Default::default()
             },