impl Deref for Layout

Author: expenses

internal/core/textlayout/sharedparley.rs

@@ -133,6 +133,14 @@ pub fn layout(text: &str, scale_factor: f32, options: LayoutOptions) -> Layout {
 }
 
 pub struct Layout {
-    pub inner: parley::Layout<Brush>,
+    inner: parley::Layout<Brush>,
     pub y_offset: f32,
 }
+
+impl std::ops::Deref for Layout {
+    type Target = parley::Layout<Brush>;
+
+    fn deref(&self) -> &Self::Target {
+        &self.inner
+    }
+}

internal/renderers/femtovg/itemrenderer.rs

@@ -202,7 +202,7 @@ fn draw_glyphs<R: femtovg::Renderer + TextureImporter>(
     selection_foreground_color: Color,
     selection_background_color: Color,
 ) {
-    for line in layout.inner.lines() {
+    for line in layout.lines() {
         for item in line.items() {
             match item {
                 parley::PositionedLayoutItem::GlyphRun(glyph_run) => {
@@ -532,11 +532,11 @@ impl<'a, R: femtovg::Renderer + TextureImporter> ItemRenderer for GLItemRenderer
 
         if cursor_visible {
             let cursor = parley::layout::cursor::Cursor::from_byte_index(
-                &layout.inner,
+                &layout,
                 cursor_pos,
                 Default::default(),
             );
-            let rect = cursor.geometry(&layout.inner, (text_input.text_cursor_width()).get());
+            let rect = cursor.geometry(&layout, (text_input.text_cursor_width()).get());
 
             let mut cursor_rect = femtovg::Path::new();
             cursor_rect.rect(

internal/renderers/femtovg/lib.rs

@@ -298,7 +298,7 @@ impl<B: GraphicsBackend> RendererSealed for FemtoVGRenderer<B> {
                 ..Default::default()
             },
         );
-        LogicalSize::new(layout.inner.width(), layout.inner.height())
+        LogicalSize::new(layout.width(), layout.height())
     }
 
     fn font_metrics(
@@ -346,7 +346,7 @@ impl<B: GraphicsBackend> RendererSealed for FemtoVGRenderer<B> {
             },
         );
         let cursor = parley::layout::cursor::Cursor::from_point(
-            &layout.inner,
+            &layout,
             pos.x,
             pos.y - layout.y_offset,
         );
@@ -385,11 +385,11 @@ impl<B: GraphicsBackend> RendererSealed for FemtoVGRenderer<B> {
             },
         );
         let cursor = parley::layout::cursor::Cursor::from_byte_index(
-            &layout.inner,
+            &layout,
             byte_offset,
             Default::default(),
         );
-        let rect = cursor.geometry(&layout.inner, (text_input.text_cursor_width()).get());
+        let rect = cursor.geometry(&layout, (text_input.text_cursor_width()).get());
         LogicalRect::new(
             LogicalPoint::new(rect.min_x() as _, rect.min_y() as f32 + layout.y_offset),
             LogicalSize::new(rect.width() as _, rect.height() as _),