fix: empty inline nodes should not prevent margin collapse

Author: LastLeaf

float-pigment-layout/src/algo/flow.rs

@@ -69,12 +69,10 @@ pub(crate) fn is_empty_block<L: LengthNum>(
     padding_border_main_axis: L,
     min_main_size: L,
     node_inner_main_size: L,
-    main_size: OptionNum<L>,
 ) -> bool {
     if !padding_border_main_axis.is_zero()
         || !min_main_size.is_zero()
         || !node_inner_main_size.is_zero()
-        || (main_size.is_some() && !main_size.val().unwrap().is_zero())
     {
         return false;
     }
@@ -674,17 +672,19 @@ impl<T: LayoutTreeNode> Flow<T> for LayoutUnit<T> {
                             request.kind == ComputeRequestKind::Position,
                         );
 
-                        if let Some((prev_collapsed_margin, prev_collapsed_through)) =
-                            prev_sibling_collapsed_margin
-                        {
-                            if !prev_collapsed_through {
-                                total_main_size += prev_collapsed_margin.solve();
+                        if block_size.main_size(axis_info.dir) > T::Length::zero() {
+                            if let Some((prev_collapsed_margin, prev_collapsed_through)) =
+                                prev_sibling_collapsed_margin
+                            {
+                                if !prev_collapsed_through {
+                                    total_main_size += prev_collapsed_margin.solve();
+                                }
                             }
+                            prev_sibling_collapsed_margin.replace((CollapsedMargin::zero(), false));
                         }
                         let main_offset = padding_border
                             .main_axis_start(axis_info.dir, axis_info.main_dir_rev)
                             + total_main_size;
-                        prev_sibling_collapsed_margin.replace((CollapsedMargin::zero(), false));
 
                         total_main_size += block_size.main_size(axis_info.dir);
                         max_cross_size = max_cross_size.max(block_size.cross_size(axis_info.dir));
@@ -800,7 +800,6 @@ impl<T: LayoutTreeNode> Flow<T> for LayoutUnit<T> {
             padding_border.main_axis_sum(axis_info.dir),
             min_max_limit.min_main_size(axis_info.dir),
             total_main_size,
-            request.size.main_size(axis_info.dir),
         ) {
             collapsed_margin.collapsed_through = true;
         }