Merge branch 'master' of https://github.com/hecrj/iced into wgpu_outdatedframe

1 files changed, 20 insertions, 3 deletions

diff --git a/examples/game_of_life/src/main.rs b/examples/game_of_life/src/main.rs
index e18bd6e0..c3e16e8b 100644
--- a/examples/game_of_life/src/main.rs
+++ b/examples/game_of_life/src/main.rs
@@ -6,12 +6,14 @@ mod style;
 use grid::Grid;
 use iced::button::{self, Button};
 use iced::executor;
+use iced::menu::{self, Menu};
 use iced::pick_list::{self, PickList};
 use iced::slider::{self, Slider};
 use iced::time;
+use iced::window;
 use iced::{
-    Align, Application, Checkbox, Column, Command, Container, Element, Length,
-    Row, Settings, Subscription, Text,
+    Align, Application, Checkbox, Clipboard, Column, Command, Container,
+    Element, Length, Row, Settings, Subscription, Text,
 };
 use preset::Preset;
 use std::time::{Duration, Instant};
@@ -19,6 +21,10 @@ use std::time::{Duration, Instant};
 pub fn main() -> iced::Result {
     GameOfLife::run(Settings {
         antialiasing: true,
+        window: window::Settings {
+            position: window::Position::Centered,
+            ..window::Settings::default()
+        },
         ..Settings::default()
     })
 }
@@ -65,7 +71,11 @@ impl Application for GameOfLife {
         String::from("Game of Life - Iced")
     }
 
-    fn update(&mut self, message: Message) -> Command<Message> {
+    fn update(
+        &mut self,
+        message: Message,
+        _clipboard: &mut Clipboard,
+    ) -> Command<Message> {
         match message {
             Message::Grid(message, version) => {
                 if version == self.version {
@@ -124,6 +134,13 @@ impl Application for GameOfLife {
         }
     }
 
+    fn menu(&self) -> Menu<Message> {
+        Menu::with_entries(vec![menu::Entry::dropdown(
+            "Presets",
+            Preset::menu().map(Message::PresetPicked),
+        )])
+    }
+
     fn view(&mut self) -> Element<Message> {
         let version = self.version;
         let selected_speed = self.next_speed.unwrap_or(self.speed);