Replace with function with Function trait
This commit is contained in:
parent
080db34849
commit
eab723866e
7 changed files with 75 additions and 79 deletions
|
|
@ -9,7 +9,7 @@ use iced::time::{self, milliseconds};
|
|||
use iced::widget::{
|
||||
button, checkbox, column, container, pick_list, row, slider, text,
|
||||
};
|
||||
use iced::{Center, Element, Fill, Subscription, Task, Theme};
|
||||
use iced::{Center, Element, Fill, Function, Subscription, Task, Theme};
|
||||
|
||||
pub fn main() -> iced::Result {
|
||||
tracing_subscriber::fmt::init();
|
||||
|
|
@ -37,7 +37,7 @@ struct GameOfLife {
|
|||
|
||||
#[derive(Debug, Clone)]
|
||||
enum Message {
|
||||
Grid(grid::Message, usize),
|
||||
Grid(usize, grid::Message),
|
||||
Tick,
|
||||
TogglePlayback,
|
||||
ToggleGrid(bool),
|
||||
|
|
@ -61,7 +61,7 @@ impl GameOfLife {
|
|||
|
||||
fn update(&mut self, message: Message) -> Task<Message> {
|
||||
match message {
|
||||
Message::Grid(message, version) => {
|
||||
Message::Grid(version, message) => {
|
||||
if version == self.version {
|
||||
self.grid.update(message);
|
||||
}
|
||||
|
|
@ -78,9 +78,7 @@ impl GameOfLife {
|
|||
|
||||
let version = self.version;
|
||||
|
||||
return Task::perform(task, move |message| {
|
||||
Message::Grid(message, version)
|
||||
});
|
||||
return Task::perform(task, Message::Grid.with(version));
|
||||
}
|
||||
}
|
||||
Message::TogglePlayback => {
|
||||
|
|
@ -129,9 +127,7 @@ impl GameOfLife {
|
|||
);
|
||||
|
||||
let content = column![
|
||||
self.grid
|
||||
.view()
|
||||
.map(move |message| Message::Grid(message, version)),
|
||||
self.grid.view().map(Message::Grid.with(version)),
|
||||
controls,
|
||||
]
|
||||
.height(Fill);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue