Merge pull request #1735 from iced-rs/remove-alignment-fill

Remove `Fill` variant for `Alignment`

core/src/alignment.rs

@@ -11,9 +11,6 @@ pub enum Alignment {
 
     /// Align at the end of the axis.
     End,
-
-    /// Fill the entire axis.
-    Fill,
 }
 
 impl From<Horizontal> for Alignment {

examples/component/src/main.rs

@@ -127,7 +127,8 @@ mod numeric_input {
                         .horizontal_alignment(alignment::Horizontal::Center)
                         .vertical_alignment(alignment::Vertical::Center),
                 )
-                .width(50)
+                .width(40)
+                .height(40)
                 .on_press(on_press)
             };
 
@@ -145,7 +146,7 @@ mod numeric_input {
                 .padding(10),
                 button("+", Event::IncrementPressed),
             ]
-            .align_items(Alignment::Fill)
+            .align_items(Alignment::Center)
             .spacing(10)
             .into()
         }

examples/scrollable/src/main.rs

@@ -254,7 +254,6 @@ impl Application for ScrollableDemo {
                             scroll_to_beginning_button(),
                             vertical_space(40),
                         ]
-                        .align_items(Alignment::Fill)
                         .spacing(40),
                         horizontal_space(1200),
                         text("Horizontal - End!"),

examples/websocket/src/main.rs

@@ -146,7 +146,9 @@ impl Application for WebSocket {
                 }
             }
 
-            row![input, button].spacing(10).align_items(Alignment::Fill)
+            row![input, button]
+                .spacing(10)
+                .align_items(Alignment::Center)
         };
 
         column![message_log, new_message_input]

native/src/layout/flex.rs

@@ -81,32 +81,6 @@ where
     let mut nodes: Vec<Node> = Vec::with_capacity(items.len());
     nodes.resize(items.len(), Node::default());
 
-    if align_items == Alignment::Fill {
-        let mut fill_cross = axis.cross(limits.min());
-
-        items.iter().for_each(|child| {
-            let cross_fill_factor = match axis {
-                Axis::Horizontal => child.as_widget().height(),
-                Axis::Vertical => child.as_widget().width(),
-            }
-            .fill_factor();
-
-            if cross_fill_factor == 0 {
-                let (max_width, max_height) = axis.pack(available, max_cross);
-
-                let child_limits =
-                    Limits::new(Size::ZERO, Size::new(max_width, max_height));
-
-                let layout = child.as_widget().layout(renderer, &child_limits);
-                let size = layout.size();
-
-                fill_cross = fill_cross.max(axis.cross(size));
-            }
-        });
-
-        cross = fill_cross;
-    }
-
     for (i, child) in items.iter().enumerate() {
         let fill_factor = match axis {
             Axis::Horizontal => child.as_widget().width(),
@@ -115,31 +89,16 @@ where
         .fill_factor();
 
         if fill_factor == 0 {
-            let (min_width, min_height) = if align_items == Alignment::Fill {
+            let (max_width, max_height) = axis.pack(available, max_cross);
-                axis.pack(0.0, cross)
-            } else {
-                axis.pack(0.0, 0.0)
-            };
 
-            let (max_width, max_height) = if align_items == Alignment::Fill {
+            let child_limits =
-                axis.pack(available, cross)
+                Limits::new(Size::ZERO, Size::new(max_width, max_height));
-            } else {
-                axis.pack(available, max_cross)
-            };
-
-            let child_limits = Limits::new(
-                Size::new(min_width, min_height),
-                Size::new(max_width, max_height),
-            );
 
             let layout = child.as_widget().layout(renderer, &child_limits);
             let size = layout.size();
 
             available -= axis.main(size);
-
+            cross = cross.max(axis.cross(size));
-            if align_items != Alignment::Fill {
-                cross = cross.max(axis.cross(size));
-            }
 
             nodes[i] = layout;
         } else {
@@ -164,17 +123,10 @@ where
                 max_main
             };
 
-            let (min_width, min_height) = if align_items == Alignment::Fill {
+            let (min_width, min_height) =
-                axis.pack(min_main, cross)
+                axis.pack(min_main, axis.cross(limits.min()));
-            } else {
-                axis.pack(min_main, axis.cross(limits.min()))
-            };
 
-            let (max_width, max_height) = if align_items == Alignment::Fill {
+            let (max_width, max_height) = axis.pack(max_main, max_cross);
-                axis.pack(max_main, cross)
-            } else {
-                axis.pack(max_main, max_cross)
-            };
 
             let child_limits = Limits::new(
                 Size::new(min_width, min_height),
@@ -182,10 +134,7 @@ where
             );
 
             let layout = child.as_widget().layout(renderer, &child_limits);
-
+            cross = cross.max(axis.cross(layout.size()));
-            if align_items != Alignment::Fill {
-                cross = cross.max(axis.cross(layout.size()));
-            }
 
             nodes[i] = layout;
         }

native/src/layout/node.rs

@@ -56,9 +56,6 @@ impl Node {
             Alignment::End => {
                 self.bounds.x += space.width - self.bounds.width;
             }
-            Alignment::Fill => {
-                self.bounds.width = space.width;
-            }
         }
 
         match vertical_alignment {
@@ -69,9 +66,6 @@ impl Node {
             Alignment::End => {
                 self.bounds.y += space.height - self.bounds.height;
             }
-            Alignment::Fill => {
-                self.bounds.height = space.height;
-            }
         }
     }