Merge branch 'iced-rs:master' into viewer_content_fit

1 files changed, 12 insertions, 12 deletions

diff --git a/examples/tour/src/main.rs b/examples/tour/src/main.rs
index f5791ad7..a88c0dba 100644
--- a/examples/tour/src/main.rs
+++ b/examples/tour/src/main.rs
@@ -4,7 +4,7 @@ use iced::widget::{
     scrollable, slider, text, text_input, toggler, vertical_space,
 };
 use iced::widget::{Button, Column, Container, Slider};
-use iced::{Color, Element, Font, Length, Pixels, Sandbox, Settings};
+use iced::{Color, Element, Font, Length, Pixels};
 
 pub fn main() -> iced::Result {
     #[cfg(target_arch = "wasm32")]
@@ -16,24 +16,18 @@ pub fn main() -> iced::Result {
     #[cfg(not(target_arch = "wasm32"))]
     tracing_subscriber::fmt::init();
 
-    Tour::run(Settings::default())
+    iced::program(Tour::title, Tour::update, Tour::view)
+        .centered()
+        .run()
 }
 
+#[derive(Default)]
 pub struct Tour {
     steps: Steps,
     debug: bool,
 }
 
-impl Sandbox for Tour {
-    type Message = Message;
-
-    fn new() -> Tour {
-        Tour {
-            steps: Steps::new(),
-            debug: false,
-        }
-    }
-
+impl Tour {
     fn title(&self) -> String {
         format!("{} - Iced", self.steps.title())
     }
@@ -171,6 +165,12 @@ impl Steps {
     }
 }
 
+impl Default for Steps {
+    fn default() -> Self {
+        Steps::new()
+    }
+}
+
 enum Step {
     Welcome,
     Slider {