Create named struct for content widths

Author: wfdewith

parley/src/layout/data.rs

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0 OR MIT
 
 use crate::inline_box::InlineBox;
-use crate::layout::{Alignment, Glyph, LineMetrics, RunMetrics, Style};
+use crate::layout::{Alignment, ContentWidths, Glyph, LineMetrics, RunMetrics, Style};
 use crate::style::Brush;
 use crate::util::nearly_zero;
 use crate::Font;
@@ -201,7 +201,7 @@ pub(crate) struct LayoutData<B: Brush> {
     pub(crate) coords: Vec<i16>,
 
     // Lazily calculated values
-    content_widths: OnceCell<(f32, f32)>,
+    content_widths: OnceCell<ContentWidths>,
 
     // Input (/ output of style resolution)
     pub(crate) styles: Vec<Style<B>>,
@@ -477,13 +477,13 @@ impl<B: Brush> LayoutData<B> {
         }
     }
 
-    pub(crate) fn content_widths(&self) -> (f32, f32) {
+    pub(crate) fn content_widths(&self) -> ContentWidths {
         *self
             .content_widths
             .get_or_init(|| self.calculate_content_widths())
     }
 
-    fn calculate_content_widths(&self) -> (f32, f32) {
+    fn calculate_content_widths(&self) -> ContentWidths {
         fn whitespace_advance(cluster: Option<&ClusterData>) -> f32 {
             cluster
                 .filter(|cluster| cluster.info.whitespace().is_space_or_nbsp())
@@ -528,6 +528,9 @@ impl<B: Brush> LayoutData<B> {
             max_width = max_width.max(running_max_width - trailing_whitespace);
         }
 
-        (min_width, max_width)
+        ContentWidths {
+            min: min_width,
+            max: max_width,
+        }
     }
 }

parley/src/layout/mod.rs

@@ -81,16 +81,9 @@ impl<B: Brush> Layout<B> {
         self.data.full_width
     }
 
-    /// Returns the minimum content width of the layout. This is the width of the layout if _all_
-    /// soft line-breaking opportunities are taken.
-    pub fn min_content_width(&self) -> f32 {
-        self.data.content_widths().0
-    }
-
-    /// Returns the maximum content width of the layout. This is the width of the layout if _no_
-    /// soft line-breaking opportunities are taken.
-    pub fn max_content_width(&self) -> f32 {
-        self.data.content_widths().1
+    /// Returns the lower and upper bounds on the width of the layout.
+    pub fn content_widths(&self) -> ContentWidths {
+        self.data.content_widths()
     }
 
     /// Returns the height of the layout.
@@ -445,3 +438,14 @@ impl LayoutAccessibility {
         }
     }
 }
+
+/// Lower and upper bounds on layout width based on its contents.
+#[derive(Copy, Clone, Debug)]
+pub struct ContentWidths {
+    /// The minimum content width. This is the width of the layout if _all_ soft line-breaking
+    /// opportunities are taken.
+    pub min: f32,
+    /// The maximum content width. This is the width of the layout if _no_ soft line-breaking
+    /// opportunities are taken.
+    pub max: f32,
+}

parley/src/tests/test_basic.rs

@@ -137,11 +137,11 @@ fn content_widths() {
 
     let mut layout = builder.build(text);
 
-    layout.break_all_lines(Some(layout.min_content_width()));
+    layout.break_all_lines(Some(layout.content_widths().min));
     layout.align(None, Alignment::Start, false);
     env.with_name("min").check_layout_snapshot(&layout);
 
-    layout.break_all_lines(Some(layout.max_content_width()));
+    layout.break_all_lines(Some(layout.content_widths().max));
     layout.align(None, Alignment::Start, false);
     env.with_name("max").check_layout_snapshot(&layout);
 }
@@ -160,7 +160,7 @@ fn inbox_content_width() {
             height: 10.0,
         });
         let mut layout = builder.build(text);
-        layout.break_all_lines(Some(layout.min_content_width()));
+        layout.break_all_lines(Some(layout.content_widths().min));
         layout.align(None, Alignment::Start, false);
 
         env.with_name("full_width").check_layout_snapshot(&layout);
@@ -176,11 +176,11 @@ fn inbox_content_width() {
             height: 10.0,
         });
         let mut layout = builder.build(text);
-        layout.break_all_lines(Some(layout.max_content_width()));
+        layout.break_all_lines(Some(layout.content_widths().max));
         layout.align(None, Alignment::Start, false);
 
         assert!(
-            nearly_eq(layout.width(), layout.max_content_width()),
+            nearly_eq(layout.width(), layout.content_widths().max),
             "Layout should be as wide as the max content width"
         );