From 1383c6a4f700ff246148c913000e9b9368ea9afc Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Sat, 21 Sep 2024 21:14:54 +0200 Subject: Fix flex layout of `Fill` elements in a `Shrink` cross axis Instead of collapsing, the `Fill` elements will fill the cross space allocated by the other `Shrink` elements present in the container. --- examples/layout/src/main.rs | 40 +++++++++++++++++++++++++++++++++++++--- 1 file changed, 37 insertions(+), 3 deletions(-) (limited to 'examples') diff --git a/examples/layout/src/main.rs b/examples/layout/src/main.rs index cb33369b..4280a003 100644 --- a/examples/layout/src/main.rs +++ b/examples/layout/src/main.rs @@ -2,12 +2,12 @@ use iced::border; use iced::keyboard; use iced::mouse; use iced::widget::{ - button, canvas, center, checkbox, column, container, horizontal_space, - pick_list, row, scrollable, text, + button, canvas, center, checkbox, column, container, horizontal_rule, + horizontal_space, pick_list, row, scrollable, text, vertical_rule, }; use iced::{ color, Center, Element, Fill, Font, Length, Point, Rectangle, Renderer, - Subscription, Theme, + Shrink, Subscription, Theme, }; pub fn main() -> iced::Result { @@ -147,6 +147,10 @@ impl Example { title: "Application", view: application, }, + Self { + title: "Quotes", + view: quotes, + }, ]; fn is_first(self) -> bool { @@ -275,6 +279,36 @@ fn application<'a>() -> Element<'a, Message> { column![header, row![sidebar, content]].into() } +fn quotes<'a>() -> Element<'a, Message> { + fn quote<'a>( + content: impl Into>, + ) -> Element<'a, Message> { + row![vertical_rule(2), content.into()] + .spacing(10) + .height(Shrink) + .into() + } + + fn reply<'a>( + original: impl Into>, + reply: impl Into>, + ) -> Element<'a, Message> { + column![quote(original), reply.into()].spacing(10).into() + } + + column![ + reply( + reply("This is the original message", "This is a reply"), + "This is another reply", + ), + horizontal_rule(1), + "A separator ↑", + ] + .width(Shrink) + .spacing(10) + .into() +} + fn square<'a>(size: impl Into + Copy) -> Element<'a, Message> { struct Square; -- cgit