max_physical_width -> max_width

Author: expenses

internal/core/textlayout/sharedparley.rs

@@ -8,7 +8,7 @@ use std::cell::RefCell;
 use crate::{
     graphics::FontRequest,
     items::TextStrokeStyle,
-    lengths::{LogicalLength, PhysicalPx},
+    lengths::{LogicalLength, ScaleFactor},
     textlayout::{TextHorizontalAlignment, TextOverflow, TextVerticalAlignment, TextWrap},
 };
 use i_slint_common::sharedfontique;
@@ -32,7 +32,7 @@ pub struct Brush {
 }
 
 pub struct LayoutOptions {
-    pub max_physical_width: Option<euclid::Length<crate::Coord, PhysicalPx>>,
+    pub max_width: Option<LogicalLength>,
     pub max_height: Option<LogicalLength>,
     pub horizontal_align: TextHorizontalAlignment,
     pub vertical_align: TextVerticalAlignment,
@@ -45,7 +45,7 @@ pub struct LayoutOptions {
 impl Default for LayoutOptions {
     fn default() -> Self {
         Self {
-            max_physical_width: None,
+            max_width: None,
             max_height: None,
             horizontal_align: TextHorizontalAlignment::Left,
             vertical_align: TextVerticalAlignment::Top,
@@ -57,8 +57,8 @@ impl Default for LayoutOptions {
     }
 }
 
-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());
+pub fn layout(text: &str, scale_factor: ScaleFactor, options: LayoutOptions) -> Layout {
+    let max_physical_width = options.max_width.map(|max_width| (max_width * scale_factor).get());
     let pixel_size = options
         .font_request
         .as_ref()
@@ -68,7 +68,7 @@ pub fn layout(text: &str, scale_factor: f32, options: LayoutOptions) -> Layout {
     let mut layout = LAYOUT_CONTEXT.with_borrow_mut(move |layout_context| {
         let mut font_context = font_context();
         let mut builder =
-            layout_context.ranged_builder(&mut font_context, text, scale_factor, true);
+            layout_context.ranged_builder(&mut font_context, text, scale_factor.get(), true);
         if let Some(ref font_request) = options.font_request {
             if let Some(family) = &font_request.family {
                 builder.push_default(parley::StyleProperty::FontStack(

internal/renderers/femtovg/itemrenderer.rs

@@ -420,12 +420,12 @@ impl<'a, R: femtovg::Renderer + TextureImporter> ItemRenderer for GLItemRenderer
 
         let layout = sharedparley::layout(
             text.text().as_str(),
-            self.scale_factor.get(),
+            self.scale_factor,
             sharedparley::LayoutOptions {
                 horizontal_align,
                 vertical_align,
                 max_height: Some(max_height),
-                max_physical_width: Some(max_width * self.scale_factor),
+                max_width: Some(max_width),
                 stroke: stroke_paint.is_some().then_some(stroke_style),
                 font_request: Some(font_request),
                 text_wrap: text.wrap(),
@@ -485,9 +485,9 @@ impl<'a, R: femtovg::Renderer + TextureImporter> ItemRenderer for GLItemRenderer
 
         let layout = sharedparley::layout(
             &text,
-            self.scale_factor.get(),
+            self.scale_factor,
             sharedparley::LayoutOptions {
-                max_physical_width: Some(width * self.scale_factor),
+                max_width: Some(width),
                 max_height: Some(height),
                 vertical_align: text_input.vertical_alignment(),
                 font_request: Some(font_request),
@@ -509,15 +509,15 @@ impl<'a, R: femtovg::Renderer + TextureImporter> ItemRenderer for GLItemRenderer
         );
 
         selection.geometry_with(&layout, |rect, _| {
-            let mut cursor_rect = femtovg::Path::new();
-            cursor_rect.rect(
+            let mut selection_path = femtovg::Path::new();
+            selection_path.rect(
                 rect.min_x() as _,
                 rect.min_y() as f32 + layout.y_offset,
                 rect.width() as _,
                 rect.height() as _,
             );
             canvas.fill_path(
-                &cursor_rect,
+                &selection_path,
                 &femtovg::Paint::color(to_femtovg_color(&text_input.selection_background_color())),
             );
         });
@@ -532,15 +532,15 @@ impl<'a, R: femtovg::Renderer + TextureImporter> ItemRenderer for GLItemRenderer
             );
             let rect = cursor.geometry(&layout, (text_input.text_cursor_width()).get());
 
-            let mut cursor_rect = femtovg::Path::new();
-            cursor_rect.rect(
+            let mut cursor_path = femtovg::Path::new();
+            cursor_path.rect(
                 rect.min_x() as _,
                 rect.min_y() as f32 + layout.y_offset,
                 rect.width() as _,
                 rect.height() as _,
             );
             canvas.fill_path(
-                &cursor_rect,
+                &cursor_path,
                 &femtovg::Paint::color(to_femtovg_color(&visual_representation.cursor_color)),
             );
         }
@@ -971,7 +971,7 @@ impl<'a, R: femtovg::Renderer + TextureImporter> ItemRenderer for GLItemRenderer
     }
 
     fn draw_string(&mut self, string: &str, color: Color) {
-        let layout = sharedparley::layout(string, self.scale_factor.get(), Default::default());
+        let layout = sharedparley::layout(string, self.scale_factor, Default::default());
         let paint = femtovg::Paint::color(to_femtovg_color(&color));
         let mut canvas = self.canvas.borrow_mut();
         draw_glyphs(&layout, &mut canvas, &paint);

internal/renderers/femtovg/lib.rs

@@ -290,9 +290,9 @@ impl<B: GraphicsBackend> RendererSealed for FemtoVGRenderer<B> {
     ) -> LogicalSize {
         let layout = sharedparley::layout(
             text,
-            scale_factor.get(),
+            scale_factor,
             sharedparley::LayoutOptions {
-                max_physical_width: max_width.map(|max_width| max_width * scale_factor),
+                max_width,
                 text_wrap,
                 font_request: Some(font_request),
                 ..Default::default()
@@ -335,13 +335,12 @@ impl<B: GraphicsBackend> RendererSealed for FemtoVGRenderer<B> {
 
         let layout = sharedparley::layout(
             &text,
-            scale_factor.get(),
+            scale_factor,
             sharedparley::LayoutOptions {
                 font_request: Some(font_request),
-                max_physical_width: Some(width * scale_factor),
+                max_width: Some(width),
                 max_height: Some(height),
                 vertical_align: text_input.vertical_alignment(),
-
                 ..Default::default()
             },
         );
@@ -374,9 +373,9 @@ impl<B: GraphicsBackend> RendererSealed for FemtoVGRenderer<B> {
 
         let layout = sharedparley::layout(
             &text,
-            scale_factor.get(),
+            scale_factor,
             sharedparley::LayoutOptions {
-                max_physical_width: Some(width * scale_factor),
+                max_width: Some(width),
                 max_height: Some(height),
                 ..Default::default()
             },