Merge branch 'master' into feature/custom-styling

7 files changed, 33 insertions, 41 deletions

diff --git a/examples/custom_widget.rs b/examples/custom_widget.rs
index 1f51ee54..0a570745 100644
--- a/examples/custom_widget.rs
+++ b/examples/custom_widget.rs
@@ -127,10 +127,7 @@ impl Sandbox for Example {
             .max_width(500)
             .align_items(Align::Center)
             .push(Circle::new(self.radius))
-            .push(
-                Text::new(format!("Radius: {}", self.radius.to_string()))
-                    .width(Length::Shrink),
-            )
+            .push(Text::new(format!("Radius: {}", self.radius.to_string())))
             .push(Slider::new(
                 &mut self.slider,
                 1.0..=100.0,
diff --git a/examples/events.rs b/examples/events.rs
index 7d83fbd8..74542171 100644
--- a/examples/events.rs
+++ b/examples/events.rs
@@ -57,13 +57,9 @@ impl Application for Events {
 
     fn view(&mut self) -> Element<Message> {
         let events = self.last.iter().fold(
-            Column::new().width(Length::Shrink).spacing(10),
+            Column::new().spacing(10),
             |column, event| {
-                column.push(
-                    Text::new(format!("{:?}", event))
-                        .size(40)
-                        .width(Length::Shrink),
-                )
+                column.push(Text::new(format!("{:?}", event)).size(40))
             },
         );
 
@@ -71,11 +67,9 @@ impl Application for Events {
             self.enabled,
             "Listen to runtime events",
             Message::Toggled,
-        )
-        .width(Length::Shrink);
+        );
 
         let content = Column::new()
-            .width(Length::Shrink)
             .align_items(Align::Center)
             .spacing(20)
             .push(events)
diff --git a/examples/pokedex.rs b/examples/pokedex.rs
index 2a696ffe..7326f94f 100644
--- a/examples/pokedex.rs
+++ b/examples/pokedex.rs
@@ -77,11 +77,8 @@ impl Application for Pokedex {
 
     fn view(&mut self) -> Element<Message> {
         let content = match self {
-            Pokedex::Loading => Column::new().width(Length::Shrink).push(
-                Text::new("Searching for Pokémon...")
-                    .width(Length::Shrink)
-                    .size(40),
-            ),
+            Pokedex::Loading => Column::new()
+                .push(Text::new("Searching for Pokémon...").size(40)),
             Pokedex::Loaded { pokemon, search } => Column::new()
                 .max_width(500)
                 .spacing(20)
@@ -91,14 +88,9 @@ impl Application for Pokedex {
                     button(search, "Keep searching!").on_press(Message::Search),
                 ),
             Pokedex::Errored { try_again, .. } => Column::new()
-                .width(Length::Shrink)
                 .spacing(20)
                 .align_items(Align::End)
-                .push(
-                    Text::new("Whoops! Something went wrong...")
-                        .width(Length::Shrink)
-                        .size(40),
-                )
+                .push(Text::new("Whoops! Something went wrong...").size(40))
                 .push(button(try_again, "Try again").on_press(Message::Search)),
         };
 
@@ -134,10 +126,13 @@ impl Pokemon {
                         Row::new()
                             .align_items(Align::Center)
                             .spacing(20)
-                            .push(Text::new(&self.name).size(30))
+                            .push(
+                                Text::new(&self.name)
+                                    .size(30)
+                                    .width(Length::Fill),
+                            )
                             .push(
                                 Text::new(format!("#{}", self.number))
-                                    .width(Length::Shrink)
                                     .size(20)
                                     .color([0.5, 0.5, 0.5]),
                             ),
diff --git a/examples/stopwatch.rs b/examples/stopwatch.rs
index 9b69f7ca..c9a61ee9 100644
--- a/examples/stopwatch.rs
+++ b/examples/stopwatch.rs
@@ -95,7 +95,6 @@ impl Application for Stopwatch {
             seconds % MINUTE,
             self.duration.subsec_millis() / 10,
         ))
-        .width(Length::Shrink)
         .size(40);
 
         let button = |state, label, style| {
@@ -123,13 +122,11 @@ impl Application for Stopwatch {
                 .on_press(Message::Reset);
 
         let controls = Row::new()
-            .width(Length::Shrink)
             .spacing(20)
             .push(toggle_button)
             .push(reset_button);
 
         let content = Column::new()
-            .width(Length::Shrink)
             .align_items(Align::Center)
             .spacing(20)
             .push(duration)
diff --git a/examples/svg.rs b/examples/svg.rs
index cdf238f0..1895039d 100644
--- a/examples/svg.rs
+++ b/examples/svg.rs
@@ -25,13 +25,14 @@ impl Sandbox for Tiger {
         let content = {
             use iced::{Column, Svg};
 
-            Column::new()
-                .width(Length::Shrink)
-                .padding(20)
-                .push(Svg::new(format!(
+            Column::new().padding(20).push(
+                Svg::new(format!(
                     "{}/examples/resources/tiger.svg",
                     env!("CARGO_MANIFEST_DIR")
-                )))
+                ))
+                .width(Length::Fill)
+                .height(Length::Fill),
+            )
         };
 
         #[cfg(not(feature = "svg"))]
@@ -39,7 +40,6 @@ impl Sandbox for Tiger {
             use iced::{HorizontalAlignment, Text};
 
             Text::new("You need to enable the `svg` feature!")
-                .width(Length::Shrink)
                 .horizontal_alignment(HorizontalAlignment::Center)
                 .size(30)
         };
diff --git a/examples/todos.rs b/examples/todos.rs
index 1563aad5..4166f75a 100644
--- a/examples/todos.rs
+++ b/examples/todos.rs
@@ -146,6 +146,7 @@ impl Application for Todos {
                 ..
             }) => {
                 let title = Text::new("todos")
+                    .width(Length::Fill)
                     .size(100)
                     .color([0.5, 0.5, 0.5])
                     .horizontal_alignment(HorizontalAlignment::Center);
@@ -284,7 +285,8 @@ impl Task {
                     self.completed,
                     &self.description,
                     TaskMessage::Completed,
-                );
+                )
+                .width(Length::Fill);
 
                 Row::new()
                     .spacing(20)
@@ -318,9 +320,10 @@ impl Task {
                     .push(
                         Button::new(
                             delete_button,
-                            Row::new().spacing(10).push(delete_icon()).push(
-                                Text::new("Delete").width(Length::Shrink),
-                            ),
+                            Row::new()
+                                .spacing(10)
+                                .push(delete_icon())
+                                .push(Text::new("Delete")),
                         )
                         .on_press(TaskMessage::Delete)
                         .padding(10)
@@ -350,7 +353,7 @@ impl Controls {
         let tasks_left = tasks.iter().filter(|task| !task.completed).count();
 
         let filter_button = |state, label, filter, current_filter| {
-            let label = Text::new(label).size(16).width(Length::Shrink);
+            let label = Text::new(label).size(16);
             let button =
                 Button::new(state, label).style(style::Button::Filter {
                     selected: filter == current_filter,
@@ -368,11 +371,11 @@ impl Controls {
                     tasks_left,
                     if tasks_left == 1 { "task" } else { "tasks" }
                 ))
+                .width(Length::Fill)
                 .size(16),
             )
             .push(
                 Row::new()
-                    .width(Length::Shrink)
                     .spacing(10)
                     .push(filter_button(
                         all_button,
diff --git a/examples/tour.rs b/examples/tour.rs
index 84e5d516..b0ee4d96 100644
--- a/examples/tour.rs
+++ b/examples/tour.rs
@@ -403,6 +403,7 @@ impl<'a> Step {
             ))
             .push(
                 Text::new(&value.to_string())
+                    .width(Length::Fill)
                     .horizontal_alignment(HorizontalAlignment::Center),
             )
     }
@@ -449,6 +450,7 @@ impl<'a> Step {
             ))
             .push(
                 Text::new(&format!("{} px", spacing))
+                    .width(Length::Fill)
                     .horizontal_alignment(HorizontalAlignment::Center),
             );
 
@@ -563,6 +565,7 @@ impl<'a> Step {
             ))
             .push(
                 Text::new(&format!("Width: {} px", width.to_string()))
+                    .width(Length::Fill)
                     .horizontal_alignment(HorizontalAlignment::Center),
             )
     }
@@ -582,6 +585,7 @@ impl<'a> Step {
             .push(Column::new().height(Length::Units(4096)))
             .push(
                 Text::new("You are halfway there!")
+                    .width(Length::Fill)
                     .size(30)
                     .horizontal_alignment(HorizontalAlignment::Center),
             )
@@ -589,6 +593,7 @@ impl<'a> Step {
             .push(ferris(300))
             .push(
                 Text::new("You made it!")
+                    .width(Length::Fill)
                     .size(50)
                     .horizontal_alignment(HorizontalAlignment::Center),
             )
@@ -631,6 +636,7 @@ impl<'a> Step {
                 } else {
                     value
                 })
+                .width(Length::Fill)
                 .horizontal_alignment(HorizontalAlignment::Center),
             )
     }