Re-export variants of Length and alignment types
This commit is contained in:
parent
f9dd5cbb09
commit
76737351ea
51 changed files with 255 additions and 395 deletions
|
|
@ -9,7 +9,7 @@ use iced::time;
|
|||
use iced::widget::{
|
||||
button, checkbox, column, container, pick_list, row, slider, text,
|
||||
};
|
||||
use iced::{Element, Length, Subscription, Task, Theme};
|
||||
use iced::{Center, Element, Fill, Subscription, Task, Theme};
|
||||
use std::time::Duration;
|
||||
|
||||
pub fn main() -> iced::Result {
|
||||
|
|
@ -135,12 +135,9 @@ impl GameOfLife {
|
|||
.map(move |message| Message::Grid(message, version)),
|
||||
controls,
|
||||
]
|
||||
.height(Length::Fill);
|
||||
.height(Fill);
|
||||
|
||||
container(content)
|
||||
.width(Length::Fill)
|
||||
.height(Length::Fill)
|
||||
.into()
|
||||
container(content).width(Fill).height(Fill).into()
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -169,7 +166,7 @@ fn view_controls<'a>(
|
|||
slider(1.0..=1000.0, speed as f32, Message::SpeedChanged),
|
||||
text!("x{speed}").size(16),
|
||||
]
|
||||
.center_y()
|
||||
.align_y(Center)
|
||||
.spacing(10);
|
||||
|
||||
row![
|
||||
|
|
@ -186,7 +183,7 @@ fn view_controls<'a>(
|
|||
]
|
||||
.padding(10)
|
||||
.spacing(20)
|
||||
.center_y()
|
||||
.align_y(Center)
|
||||
.into()
|
||||
}
|
||||
|
||||
|
|
@ -199,7 +196,7 @@ mod grid {
|
|||
use iced::widget::canvas::event::{self, Event};
|
||||
use iced::widget::canvas::{Cache, Canvas, Frame, Geometry, Path, Text};
|
||||
use iced::{
|
||||
Color, Element, Length, Point, Rectangle, Renderer, Size, Theme, Vector,
|
||||
Color, Element, Fill, Point, Rectangle, Renderer, Size, Theme, Vector,
|
||||
};
|
||||
use rustc_hash::{FxHashMap, FxHashSet};
|
||||
use std::future::Future;
|
||||
|
|
@ -333,10 +330,7 @@ mod grid {
|
|||
}
|
||||
|
||||
pub fn view(&self) -> Element<Message> {
|
||||
Canvas::new(self)
|
||||
.width(Length::Fill)
|
||||
.height(Length::Fill)
|
||||
.into()
|
||||
Canvas::new(self).width(Fill).height(Fill).into()
|
||||
}
|
||||
|
||||
pub fn clear(&mut self) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue