Merge branch 'master' into feature/text-input

1 files changed, 17 insertions, 14 deletions

diff --git a/examples/tour.rs b/examples/tour.rs
index c2b3e645..c5daa2c5 100644
--- a/examples/tour.rs
+++ b/examples/tour.rs
@@ -528,20 +528,7 @@ impl<'a> Step {
     ) -> Column<'a, StepMessage> {
         Self::container("Image")
             .push(Text::new("An image that tries to keep its aspect ratio."))
-            .push(
-                // This should go away once we unify resource loading on native
-                // platforms
-                if cfg!(target_arch = "wasm32") {
-                    Image::new("resources/ferris.png")
-                } else {
-                    Image::new(format!(
-                        "{}/examples/resources/ferris.png",
-                        env!("CARGO_MANIFEST_DIR")
-                    ))
-                }
-                .width(Length::Units(width))
-                .align_self(Align::Center),
-            )
+            .push(ferris(width))
             .push(Slider::new(
                 slider,
                 100.0..=500.0,
@@ -573,6 +560,7 @@ impl<'a> Step {
                     .horizontal_alignment(HorizontalAlignment::Center),
             )
             .push(Column::new().height(Length::Units(4096)))
+            .push(ferris(300))
             .push(
                 Text::new("You made it!")
                     .size(50)
@@ -639,6 +627,21 @@ impl<'a> Step {
     }
 }
 
+fn ferris(width: u16) -> Image {
+    // This should go away once we unify resource loading on native
+    // platforms
+    if cfg!(target_arch = "wasm32") {
+        Image::new("resources/ferris.png")
+    } else {
+        Image::new(format!(
+            "{}/examples/resources/ferris.png",
+            env!("CARGO_MANIFEST_DIR")
+        ))
+    }
+    .width(Length::Units(width))
+    .align_self(Align::Center)
+}
+
 fn button<'a, Message>(
     state: &'a mut button::State,
     label: &str,