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`.
This commit is contained in:
parent
93fec8d273
commit
c0ab988842
21 changed files with 19 additions and 673 deletions
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue