From 5fae6e59ffbc5913761df638dc7f0c35b7f43bc9 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Mon, 20 Sep 2021 14:33:02 +0700 Subject: Introduce and use `CrossAlign` enum for `Column` and `Row` --- examples/game_of_life/src/main.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'examples/game_of_life/src/main.rs') diff --git a/examples/game_of_life/src/main.rs b/examples/game_of_life/src/main.rs index bc6c3708..38f4fcbd 100644 --- a/examples/game_of_life/src/main.rs +++ b/examples/game_of_life/src/main.rs @@ -11,8 +11,8 @@ use iced::slider::{self, Slider}; use iced::time; use iced::window; use iced::{ - Align, Application, Checkbox, Column, Command, Container, Element, Length, - Row, Settings, Subscription, Text, + Application, Checkbox, Column, Command, Container, CrossAlign, Element, + Length, Row, Settings, Subscription, Text, }; use preset::Preset; use std::time::{Duration, Instant}; @@ -844,7 +844,7 @@ impl Controls { let speed_controls = Row::new() .width(Length::Fill) - .align_items(Align::Center) + .align_items(CrossAlign::Center) .spacing(10) .push( Slider::new( @@ -860,7 +860,7 @@ impl Controls { Row::new() .padding(10) .spacing(20) - .align_items(Align::Center) + .align_items(CrossAlign::Center) .push(playback_controls) .push(speed_controls) .push( -- cgit From a0ad3996225601aaa1ebe051cba115374b55c80e Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Mon, 20 Sep 2021 15:09:55 +0700 Subject: Refactor alignment types into an `alignment` module --- examples/game_of_life/src/main.rs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'examples/game_of_life/src/main.rs') diff --git a/examples/game_of_life/src/main.rs b/examples/game_of_life/src/main.rs index 38f4fcbd..50112618 100644 --- a/examples/game_of_life/src/main.rs +++ b/examples/game_of_life/src/main.rs @@ -11,7 +11,7 @@ use iced::slider::{self, Slider}; use iced::time; use iced::window; use iced::{ - Application, Checkbox, Column, Command, Container, CrossAlign, Element, + Alignment, Application, Checkbox, Column, Command, Container, Element, Length, Row, Settings, Subscription, Text, }; use preset::Preset; @@ -158,10 +158,10 @@ impl Application for GameOfLife { mod grid { use crate::Preset; use iced::{ + alignment, canvas::event::{self, Event}, canvas::{self, Cache, Canvas, Cursor, Frame, Geometry, Path, Text}, - mouse, Color, Element, HorizontalAlignment, Length, Point, Rectangle, - Size, Vector, VerticalAlignment, + mouse, Color, Element, Length, Point, Rectangle, Size, Vector, }; use rustc_hash::{FxHashMap, FxHashSet}; use std::future::Future; @@ -498,8 +498,8 @@ mod grid { color: Color::WHITE, size: 14.0, position: Point::new(frame.width(), frame.height()), - horizontal_alignment: HorizontalAlignment::Right, - vertical_alignment: VerticalAlignment::Bottom, + horizontal_alignment: alignment::Horizontal::Right, + vertical_alignment: alignment::Vertical::Bottom, ..Text::default() }; @@ -844,7 +844,7 @@ impl Controls { let speed_controls = Row::new() .width(Length::Fill) - .align_items(CrossAlign::Center) + .align_items(Alignment::Center) .spacing(10) .push( Slider::new( @@ -860,7 +860,7 @@ impl Controls { Row::new() .padding(10) .spacing(20) - .align_items(CrossAlign::Center) + .align_items(Alignment::Center) .push(playback_controls) .push(speed_controls) .push( -- cgit