From c0ab9888426b7d1f2606afafc9dba06eed7f9419 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Wed, 15 Sep 2021 15:31:40 +0700 Subject: 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`. --- examples/game_of_life/src/main.rs | 8 -------- examples/game_of_life/src/preset.rs | 13 ------------- 2 files changed, 21 deletions(-) (limited to 'examples/game_of_life/src') 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 { - Menu::with_entries(vec![menu::Entry::dropdown( - "Presets", - Preset::menu().map(Message::PresetPicked), - )]) - } - fn view(&mut self) -> Element { 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 { - 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 { -- cgit