Fix calculate_content_widths when inline boxes immediately follow a hard/explicit newline

parley/src/layout/data.rs

@@ -386,6 +386,7 @@ impl<B: Brush> LayoutData<B> {
                     }
                     for atom in slice.atoms_start() {
                         let character = &atom.characters()[0];
+                        let whitespace = character.info.whitespace();
                         let boundary = character.info.boundary();
                         let style = &self.styles[character.style_index as usize];
                         let prev_text_wrap_mode = text_wrap_mode;
@@ -398,15 +399,31 @@ impl<B: Brush> LayoutData<B> {
                             let trailing_whitespace = whitespace_advance(prev_atom);
                             min_width = min_width.max(running_min_width - trailing_whitespace);
                             running_min_width = 0.0;
-                            if boundary == Boundary::Mandatory {
-                                max_width = max_width.max(running_max_width - trailing_whitespace);
-                                running_max_width = 0.0;
-                            }
                         }
-                        running_min_width += atom.advance();
-                        running_max_width += atom.advance();
-                        if !is_rtl {
-                            prev_atom = Some((character.info.whitespace(), atom.advance()));
+
+                        // Handle `Whitespace::Newline` rather than relying on `Boundary::Mandatory`,
+                        // because `Boundary::Mandatory` is only set on the character *following* a break,
+                        // at which point it is too late too handle inline boxes between the line break
+                        // and the following character.
+                        //
+                        // This function doesn't have special handling for CRLF because two linebreaks
+                        // immediately following each are equivalent to one linebreak for the purpose of
+                        // width calculation.
+                        if whitespace == Whitespace::Newline {
+                            let trailing_whitespace = whitespace_advance(prev_atom);
+                            min_width = min_width.max(running_min_width - trailing_whitespace);
+                            max_width = max_width.max(running_max_width - trailing_whitespace);
+                            running_min_width = 0.0;
+                            running_max_width = 0.0;
+                            if !is_rtl {
+                                prev_atom = None;
+                            }
+                        } else {
+                            running_min_width += atom.advance();
+                            running_max_width += atom.advance();
+                            if !is_rtl {
+                                prev_atom = Some((whitespace, atom.advance()));
+                            }
                         }
                     }
                     let trailing_whitespace = whitespace_advance(prev_atom);

parley_tests/tests/issues.rs

@@ -5,7 +5,10 @@
 
 use crate::test_name;
 use crate::util::TestEnv;
-use parley::{Alignment, AlignmentOptions, PositionedLayoutItem, StyleProperty, TextWrapMode};
+use parley::{
+    Alignment, AlignmentOptions, InlineBox, InlineBoxKind, PositionedLayoutItem, StyleProperty,
+    TextWrapMode,
+};
 
 /// Test that rendering RTL text doesn't affect subsequent LTR layouts.
 /// See <https://github.com/linebender/parley/issues/489>.
@@ -114,3 +117,38 @@ Third line that ends with newlines\n\n";
     env.with_name("max_context_with_mandatory_breaks")
         .check_layout_snapshot(&layout);
 }
+
+/// Test that inline boxes directly following a mandatory line break all
+/// contribute to the max content width of the line they end up on.
+#[test]
+fn inline_boxes_after_newline_max_content_width() {
+    let mut env = TestEnv::new(test_name!(), None);
+
+    // A newline followed by three inline boxes separated by spaces.
+    let text = "\n  ";
+    let mut builder = env.ranged_builder(text);
+    for (id, index) in [(0_u64, 1_usize), (1, 2), (2, 3)] {
+        builder.push_inline_box(InlineBox {
+            id,
+            kind: InlineBoxKind::InFlow,
+            index,
+            width: 14.0,
+            height: 30.0,
+            baseline: None,
+        });
+    }
+    let mut layout = builder.build(text);
+
+    let content_widths = layout.calculate_content_widths();
+
+    layout.break_all_lines(Some(content_widths.max));
+    layout.align(Alignment::Start, AlignmentOptions::default());
+    assert!(
+        layout.width() <= content_widths.max,
+        "Layout should never be wider than the max content width (width: {}, max: {})",
+        layout.width(),
+        content_widths.max
+    );
+    env.with_name("inline_boxes_after_newline")
+        .check_layout_snapshot(&layout);
+}