summaryrefslogtreecommitdiffstats
path: root/examples/game_of_life
diff options
context:
space:
mode:
authorLibravatar Héctor Ramón Jiménez <hector0193@gmail.com>2021-09-15 15:31:40 +0700
committerLibravatar Héctor Ramón Jiménez <hector0193@gmail.com>2021-09-15 15:31:40 +0700
commitc0ab9888426b7d1f2606afafc9dba06eed7f9419 (patch)
tree909d04f52e5b2bb51a5784b855a77b45d4a53592 /examples/game_of_life
parent93fec8d273ef8305e1c2456abe0c8ecd7a9d9407 (diff)
downloadiced-c0ab9888426b7d1f2606afafc9dba06eed7f9419.tar.gz
iced-c0ab9888426b7d1f2606afafc9dba06eed7f9419.tar.bz2
iced-c0ab9888426b7d1f2606afafc9dba06eed7f9419.zip
Revert system menus support
The current implementation has some important issues on Windows. We will reintroduce the feature once we figure them out! I have kept some of the changes in #945, like the new `keyboard::Modifiers` powered by `bitflags`.
Diffstat (limited to 'examples/game_of_life')
-rw-r--r--examples/game_of_life/src/main.rs8
-rw-r--r--examples/game_of_life/src/preset.rs13
2 files changed, 0 insertions, 21 deletions
diff --git a/examples/game_of_life/src/main.rs b/examples/game_of_life/src/main.rs
index 2d46634f..bc6c3708 100644
--- a/examples/game_of_life/src/main.rs
+++ b/examples/game_of_life/src/main.rs
@@ -6,7 +6,6 @@ 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;
@@ -130,13 +129,6 @@ 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);
diff --git a/examples/game_of_life/src/preset.rs b/examples/game_of_life/src/preset.rs
index 1c199a72..05157b6a 100644
--- a/examples/game_of_life/src/preset.rs
+++ b/examples/game_of_life/src/preset.rs
@@ -1,5 +1,3 @@
-use iced::menu::{self, Menu};
-
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
pub enum Preset {
Custom,
@@ -28,17 +26,6 @@ pub static ALL: &[Preset] = &[
];
impl Preset {
- pub fn menu() -> Menu<Self> {
- Menu::with_entries(
- ALL.iter()
- .copied()
- .map(|preset| {
- menu::Entry::item(preset.to_string(), None, preset)
- })
- .collect(),
- )
- }
-
pub fn life(self) -> Vec<(isize, isize)> {
#[rustfmt::skip]
let cells = match self {