Merge pull request #3005 from iced-rs/feature/markdown-quotes

Quotes for `markdown` widget

Author: hecrj

core/src/layout/flex.rs

@@ -137,16 +137,24 @@ where
     //
     // We use the maximum cross length obtained in the first pass as the maximum
     // cross limit.
+    //
+    // We can defer the layout of any elements that have a fixed size in the main axis,
+    // allowing them to use the cross calculations of the next pass.
     if cross_compress && some_fill_cross {
         for (i, (child, tree)) in items.iter().zip(trees.iter_mut()).enumerate()
         {
-            let (fill_main_factor, fill_cross_factor) = {
+            let (main_size, cross_size) = {
                 let size = child.as_widget().size();
 
-                axis.pack(size.width.fill_factor(), size.height.fill_factor())
+                axis.pack(size.width, size.height)
             };
 
-            if fill_main_factor == 0 && fill_cross_factor != 0 {
+            if main_size.fill_factor() == 0 && cross_size.fill_factor() != 0 {
+                if let Length::Fixed(main) = main_size {
+                    available -= main;
+                    continue;
+                }
+
                 let (max_width, max_height) = axis.pack(available, cross);
 
                 let child_limits =
@@ -176,9 +184,9 @@ where
     };
 
     // THIRD PASS
-    // We only have the elements that are fluid in the main axis left.
+    // We lay out the elements that are fluid in the main axis.
     // We use the remaining space to evenly allocate space based on fill factors.
-    for (i, (child, tree)) in items.iter().zip(trees).enumerate() {
+    for (i, (child, tree)) in items.iter().zip(trees.iter_mut()).enumerate() {
         let (fill_main_factor, fill_cross_factor) = {
             let size = child.as_widget().size();
 
@@ -224,10 +232,43 @@ where
         }
     }
 
+    // FOURTH PASS (conditional)
+    // We lay out any elements that were deferred in the second pass.
+    // These are elements that must be compressed in their cross axis and have
+    // a fixed length in the main axis.
+    if cross_compress && some_fill_cross {
+        for (i, (child, tree)) in items.iter().zip(trees).enumerate() {
+            let (main_size, cross_size) = {
+                let size = child.as_widget().size();
+
+                axis.pack(size.width, size.height)
+            };
+
+            if cross_size.fill_factor() != 0 {
+                let Length::Fixed(main) = main_size else {
+                    continue;
+                };
+
+                let (max_width, max_height) = axis.pack(main, cross);
+
+                let child_limits =
+                    Limits::new(Size::ZERO, Size::new(max_width, max_height));
+
+                let layout =
+                    child.as_widget().layout(tree, renderer, &child_limits);
+                let size = layout.size();
+
+                cross = cross.max(axis.cross(size));
+
+                nodes[i] = layout;
+            }
+        }
+    }
+
     let pad = axis.pack(padding.left, padding.top);
     let mut main = pad.0;
 
-    // FOURTH PASS
+    // FIFTH PASS
     // We align all the laid out nodes in the cross axis, if needed.
     for (i, node) in nodes.iter_mut().enumerate() {
         if i > 0 {

examples/styling/snapshots/catppuccin_frappé-tiny-skia.sha256

@@ -1 +1 @@
-12ba47a34ed415825a23f8ef377a2d52950d2f8614a66bf46c0ec28d0cf15c85
+30570747bb062e9f7730cdd58be961c84bcf4711a6983185bff6d903e8d29e9c

examples/styling/snapshots/catppuccin_latte-tiny-skia.sha256

@@ -1 +1 @@
-fa00d7e0ff95b366945d409712d7fe4ce44fff22425236cb56b8b96a88815ee6
+039a950d09d34df222606eaf2166e65f86d5536f8abfaff0e295219c974d54c0

examples/styling/snapshots/catppuccin_macchiato-tiny-skia.sha256

@@ -1 +1 @@
-4e594cfec775d51f7f836646c59bf4a2de07252721d66ddddea69c17e9112bae
+30e523961db89a3ee97ad1eac09e727ecb3dec485faa362534a9f5ad083b32dd

examples/styling/snapshots/catppuccin_mocha-tiny-skia.sha256

@@ -1 +1 @@
-2ab665b51387c61086ae0199c29e291105bfe4583bd4c4daa652e30917f10bd6
+bce5427d5105f68e1d7fa18a34fcc551cb78c2fefd9a583ba44686331133436d

examples/styling/snapshots/dark-tiny-skia.sha256

@@ -1 +1 @@
-61c9ee377b33ffa800f512877e45ad5f41fbac36f5d3f06d1b62d6af6ee9d7b2
+c8a7edbd5a8bbf559134b84253e14e65340f4ffe3e22c272b21c8438e47ffaf7

examples/styling/snapshots/dracula-tiny-skia.sha256

@@ -1 +1 @@
-75f2fb12c9090a256708515de01a25e78905f71e134b7cda79f4fe44b2434052
+63d646b22d3dffbb56dac2e3f345090bd26625a388dd6cc142359f2a7ac9c8df

examples/styling/snapshots/ferra-tiny-skia.sha256

@@ -1 +1 @@
-b4a1b42d2e21b2a493605745e6beb8e1f28cbeb01b73336e1e8d9061249a8311
+d26f55674cbd96bc3b534ffdd098a13199718ef9c5ffe8ece0882ddab714b776

examples/styling/snapshots/gruvbox_dark-tiny-skia.sha256

@@ -1 +1 @@
-eb52921b3ee23e1814268701c935d0dff387e7eb741c50443f75a7ab902b5e44
+482c44c13d4ff3de19e71f3dddf93bbee170e54e2d353e818811069de28e18ed

examples/styling/snapshots/gruvbox_light-tiny-skia.sha256

@@ -1 +1 @@
-bf6c4cbd6eeed0167d28509e37292f5ce26ed1d58bb156bedb861d0619a1945b
+6738cc4fc6eb8a5d406c613a4b0f08c0e8dcd2c1a5444445eebd3888f9303841