Merge pull request iced-rs#1044 from tarkah/feature/align-fill-variant

Add Align::Fill variant
tarkah · Sep 30, 2021 · 787302b · 787302b
1 parent 099981c
commit 787302b
Show file tree

Hide file tree

Showing 54 changed files with 472 additions and 336 deletions.
diff --git a/core/src/align.rs b/core/src/align.rs
diff --git a/core/src/alignment.rs b/core/src/alignment.rs
@@ -0,0 +1,63 @@
+//! Align and position widgets.
+
+/// Alignment on the axis of a container.
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+pub enum Alignment {
+    /// Align at the start of the axis.
+    Start,
+
+    /// Align at the center of the axis.
+    Center,
+
+    /// Align at the end of the axis.
+    End,
+
+    /// Fill the entire axis.
+    Fill,
+}
+
+impl From<Horizontal> for Alignment {
+    fn from(horizontal: Horizontal) -> Self {
+        match horizontal {
+            Horizontal::Left => Self::Start,
+            Horizontal::Center => Self::Center,
+            Horizontal::Right => Self::End,
+        }
+    }
+}
+
+impl From<Vertical> for Alignment {
+    fn from(vertical: Vertical) -> Self {
+        match vertical {
+            Vertical::Top => Self::Start,
+            Vertical::Center => Self::Center,
+            Vertical::Bottom => Self::End,
+        }
+    }
+}
+
+/// The horizontal [`Alignment`] of some resource.
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum Horizontal {
+    /// Align left
+    Left,
+
+    /// Horizontally centered
+    Center,
+
+    /// Align right
+    Right,
+}
+
+/// The vertical [`Alignment`] of some resource.
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum Vertical {
+    /// Align top
+    Top,
+
+    /// Vertically centered
+    Center,
+
+    /// Align bottom
+    Bottom,
+}
diff --git a/core/src/lib.rs b/core/src/lib.rs
@@ -14,11 +14,11 @@
 #![deny(unused_results)]
 #![forbid(unsafe_code)]
 #![forbid(rust_2018_idioms)]
+pub mod alignment;
 pub mod keyboard;
 pub mod mouse;
 pub mod text;
 
-mod align;
 mod background;
 mod color;
 mod font;
@@ -29,7 +29,7 @@ mod rectangle;
 mod size;
 mod vector;
 
-pub use align::{Align, HorizontalAlignment, VerticalAlignment};
+pub use alignment::Alignment;
 pub use background::Background;
 pub use color::Color;
 pub use font::Font;

diff --git a/examples/bezier_tool/src/main.rs b/examples/bezier_tool/src/main.rs
@@ -1,6 +1,6 @@
 //! This example showcases an interactive `Canvas` for drawing Bézier curves.
 use iced::{
-    button, Align, Button, Column, Element, Length, Sandbox, Settings, Text,
+    button, Alignment, Button, Column, Element, Length, Sandbox, Settings, Text,
 };
 
 pub fn main() -> iced::Result {
@@ -51,7 +51,7 @@ impl Sandbox for Example {
         Column::new()
             .padding(20)
             .spacing(20)
-            .align_items(Align::Center)
+            .align_items(Alignment::Center)
             .push(
                 Text::new("Bezier tool example")
                     .width(Length::Shrink)

diff --git a/examples/color_palette/src/main.rs b/examples/color_palette/src/main.rs
@@ -1,8 +1,7 @@
 use iced::canvas::{self, Cursor, Frame, Geometry, Path};
 use iced::{
-    slider, Align, Canvas, Color, Column, Element, HorizontalAlignment, Length,
+    alignment, slider, Alignment, Canvas, Color, Column, Element, Length,
     Point, Rectangle, Row, Sandbox, Settings, Size, Slider, Text, Vector,
-    VerticalAlignment,
 };
 use palette::{self, Hsl, Limited, Srgb};
 use std::marker::PhantomData;
@@ -163,8 +162,8 @@ impl Theme {
         });
 
         let mut text = canvas::Text {
-            horizontal_alignment: HorizontalAlignment::Center,
-            vertical_alignment: VerticalAlignment::Top,
+            horizontal_alignment: alignment::Horizontal::Center,
+            vertical_alignment: alignment::Vertical::Top,
             size: 15.0,
             ..canvas::Text::default()
         };
@@ -206,7 +205,7 @@ impl Theme {
             });
         }
 
-        text.vertical_alignment = VerticalAlignment::Bottom;
+        text.vertical_alignment = alignment::Vertical::Bottom;
 
         let hsl = Hsl::from(Srgb::from(self.base));
         for i in 0..self.len() {
@@ -298,7 +297,7 @@ impl<C: 'static + ColorSpace + Copy> ColorPicker<C> {
 
         Row::new()
             .spacing(10)
-            .align_items(Align::Center)
+            .align_items(Alignment::Center)
             .push(Text::new(C::LABEL).width(Length::Units(50)))
             .push(slider(s1, cr1, c1, move |v| C::new(v, c2, c3)))
             .push(slider(s2, cr2, c2, move |v| C::new(c1, v, c3)))

diff --git a/examples/counter/src/main.rs b/examples/counter/src/main.rs
@@ -1,4 +1,6 @@
-use iced::{button, Align, Button, Column, Element, Sandbox, Settings, Text};
+use iced::{
+    button, Alignment, Button, Column, Element, Sandbox, Settings, Text,
+};
 
 pub fn main() -> iced::Result {
     Counter::run(Settings::default())
@@ -42,7 +44,7 @@ impl Sandbox for Counter {
     fn view(&mut self) -> Element<Message> {
         Column::new()
             .padding(20)
-            .align_items(Align::Center)
+            .align_items(Alignment::Center)
             .push(
                 Button::new(&mut self.increment_button, Text::new("Increment"))
                     .on_press(Message::IncrementPressed),

diff --git a/examples/custom_widget/src/main.rs b/examples/custom_widget/src/main.rs
@@ -84,7 +84,7 @@ mod circle {
 
 use circle::Circle;
 use iced::{
-    slider, Align, Column, Container, Element, Length, Sandbox, Settings,
+    slider, Alignment, Column, Container, Element, Length, Sandbox, Settings,
     Slider, Text,
 };
 
@@ -129,7 +129,7 @@ impl Sandbox for Example {
             .padding(20)
             .spacing(20)
             .max_width(500)
-            .align_items(Align::Center)
+            .align_items(Alignment::Center)
             .push(Circle::new(self.radius))
             .push(Text::new(format!("Radius: {:.2}", self.radius)))
             .push(

diff --git a/examples/download_progress/src/main.rs b/examples/download_progress/src/main.rs
@@ -1,6 +1,6 @@
 use iced::{
-    button, executor, Align, Application, Button, Column, Command, Container,
-    Element, Length, ProgressBar, Settings, Subscription, Text,
+    button, executor, Alignment, Application, Button, Column, Command,
+    Container, Element, Length, ProgressBar, Settings, Subscription, Text,
 };
 
 mod download;
@@ -83,7 +83,7 @@ impl Application for Example {
                     .on_press(Message::Add)
                     .padding(10),
             )
-            .align_items(Align::End);
+            .align_items(Alignment::End);
 
         Container::new(downloads)
             .width(Length::Fill)
@@ -182,7 +182,7 @@ impl Download {
             }
             State::Finished { button } => Column::new()
                 .spacing(10)
-                .align_items(Align::Center)
+                .align_items(Alignment::Center)
                 .push(Text::new("Download finished!"))
                 .push(
                     Button::new(button, Text::new("Start again"))
@@ -195,7 +195,7 @@ impl Download {
             }
             State::Errored { button } => Column::new()
                 .spacing(10)
-                .align_items(Align::Center)
+                .align_items(Alignment::Center)
                 .push(Text::new("Something went wrong :("))
                 .push(
                     Button::new(button, Text::new("Try again"))
@@ -207,7 +207,7 @@ impl Download {
         Column::new()
             .spacing(10)
             .padding(10)
-            .align_items(Align::Center)
+            .align_items(Alignment::Center)
             .push(progress_bar)
             .push(control)
             .into()

diff --git a/examples/events/src/main.rs b/examples/events/src/main.rs
@@ -1,7 +1,6 @@
 use iced::{
-    button, executor, Align, Application, Button, Checkbox, Column, Command,
-    Container, Element, HorizontalAlignment, Length, Settings, Subscription,
-    Text,
+    alignment, button, executor, Alignment, Application, Button, Checkbox,
+    Column, Command, Container, Element, Length, Settings, Subscription, Text,
 };
 use iced_native::{window, Event};
 
@@ -91,14 +90,14 @@ impl Application for Events {
             &mut self.exit,
             Text::new("Exit")
                 .width(Length::Fill)
-                .horizontal_alignment(HorizontalAlignment::Center),
+                .horizontal_alignment(alignment::Horizontal::Center),
         )
         .width(Length::Units(100))
         .padding(10)
         .on_press(Message::Exit);
 
         let content = Column::new()
-            .align_items(Align::Center)
+            .align_items(Alignment::Center)
             .spacing(20)
             .push(events)
             .push(toggle)

diff --git 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,
+    Alignment, Application, Checkbox, Column, Command, Container, Element,
+    Length, Row, Settings, Subscription, Text,
 };
 use preset::Preset;
 use std::time::{Duration, Instant};
@@ -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(Align::Center)
+            .align_items(Alignment::Center)
             .spacing(10)
             .push(
                 Slider::new(
@@ -860,7 +860,7 @@ impl Controls {
         Row::new()
             .padding(10)
             .spacing(20)
-            .align_items(Align::Center)
+            .align_items(Alignment::Center)
             .push(playback_controls)
             .push(speed_controls)
             .push(

diff --git a/examples/geometry/src/main.rs b/examples/geometry/src/main.rs
@@ -161,8 +161,8 @@ mod rainbow {
 }
 
 use iced::{
-    scrollable, Align, Column, Container, Element, Length, Sandbox, Scrollable,
-    Settings, Text,
+    scrollable, Alignment, Column, Container, Element, Length, Sandbox,
+    Scrollable, Settings, Text,
 };
 use rainbow::Rainbow;
 
@@ -194,7 +194,7 @@ impl Sandbox for Example {
             .padding(20)
             .spacing(20)
             .max_width(500)
-            .align_items(Align::Start)
+            .align_items(Alignment::Start)
             .push(Rainbow::new())
             .push(Text::new(
                 "In this example we draw a custom widget Rainbow, using \

diff --git a/examples/integration_opengl/src/controls.rs b/examples/integration_opengl/src/controls.rs
@@ -1,7 +1,8 @@
 use iced_glow::Renderer;
+use iced_glutin::slider;
 use iced_glutin::{
-    slider, Align, Color, Column, Command, Element, Length, Program, Row,
-    Slider, Text,
+    Alignment, Color, Column, Command, Element, Length, Program, Row, Slider,
+    Text,
 };
 
 pub struct Controls {
@@ -79,11 +80,11 @@ impl Program for Controls {
         Row::new()
             .width(Length::Fill)
             .height(Length::Fill)
-            .align_items(Align::End)
+            .align_items(Alignment::End)
             .push(
                 Column::new()
                     .width(Length::Fill)
-                    .align_items(Align::End)
+                    .align_items(Alignment::End)
                     .push(
                         Column::new()
                             .padding(10)