Merge pull request #2 from cryptowatch/pure-qol

Add `column!` and `row!` macros in `iced_pure`

examples/pure/game_of_life/src/main.rs

@@ -140,13 +140,12 @@ impl Application for GameOfLife {
             self.grid.preset(),
         );
 
-        let content = column()
-            .push(
-                self.grid
-                    .view()
-                    .map(move |message| Message::Grid(message, version)),
-            )
-            .push(controls);
+        let content = column![
+            self.grid
+                .view()
+                .map(move |message| Message::Grid(message, version)),
+            controls
+        ];
 
         container(content)
             .width(Length::Fill)

pure/src/helpers.rs

@@ -6,6 +6,32 @@ use iced_native::Length;
 use std::borrow::Cow;
 use std::ops::RangeInclusive;
 
+/// Creates a [`Column`] with the given children.
+///
+/// [`Column`]: widget::Column
+#[macro_export]
+macro_rules! column {
+    () => (
+        $crate::widget::Column::new()
+    );
+    ($($x:expr),+ $(,)?) => (
+        $crate::widget::Column::with_children(vec![$($crate::Element::from($x)),+])
+    );
+}
+
+/// Creates a [`Row`] with the given children.
+///
+/// [`Row`]: widget::Row
+#[macro_export]
+macro_rules! row {
+    () => (
+        $crate::widget::Row::new()
+    );
+    ($($x:expr),+ $(,)?) => (
+        $crate::widget::Row::with_children(vec![$($crate::Element::from($x)),+])
+    );
+}
+
 /// Creates a new [`Container`] with the provided content.
 ///
 /// [`Container`]: widget::Container

pure/src/widget/button.rs

@@ -261,14 +261,14 @@ where
     }
 }
 
-impl<'a, Message, Renderer> Into<Element<'a, Message, Renderer>>
-    for Button<'a, Message, Renderer>
+impl<'a, Message, Renderer> From<Button<'a, Message, Renderer>>
+    for Element<'a, Message, Renderer>
 where
     Message: Clone + 'a,
     Renderer: iced_native::Renderer + 'a,
     Renderer::Theme: StyleSheet,
 {
-    fn into(self) -> Element<'a, Message, Renderer> {
-        Element::new(self)
+    fn from(button: Button<'a, Message, Renderer>) -> Self {
+        Self::new(button)
     }
 }

pure/src/widget/checkbox.rs

@@ -96,14 +96,16 @@ where
     }
 }
 
-impl<'a, Message, Renderer> Into<Element<'a, Message, Renderer>>
-    for Checkbox<'a, Message, Renderer>
+impl<'a, Message, Renderer> From<Checkbox<'a, Message, Renderer>>
+    for Element<'a, Message, Renderer>
 where
     Message: 'a,
-    Renderer: text::Renderer + 'a,
+    Renderer: 'a + text::Renderer,
     Renderer::Theme: StyleSheet + widget::text::StyleSheet,
 {
-    fn into(self) -> Element<'a, Message, Renderer> {
-        Element::new(self)
+    fn from(
+        checkbox: Checkbox<'a, Message, Renderer>,
+    ) -> Element<'a, Message, Renderer> {
+        Element::new(checkbox)
     }
 }

pure/src/widget/column.rs

@@ -228,13 +228,13 @@ where
     }
 }
 
-impl<'a, Message, Renderer> Into<Element<'a, Message, Renderer>>
-    for Column<'a, Message, Renderer>
+impl<'a, Message, Renderer> From<Column<'a, Message, Renderer>>
+    for Element<'a, Message, Renderer>
 where
     Message: 'a,
     Renderer: iced_native::Renderer + 'a,
 {
-    fn into(self) -> Element<'a, Message, Renderer> {
-        Element::new(self)
+    fn from(column: Column<'a, Message, Renderer>) -> Self {
+        Self::new(column)
     }
 }

pure/src/widget/image.rs

@@ -56,14 +56,13 @@ where
     }
 }
 
-impl<'a, Message, Renderer, Handle> Into<Element<'a, Message, Renderer>>
-    for Image<Handle>
+impl<'a, Message, Renderer, Handle> From<Image<Handle>>
+    for Element<'a, Message, Renderer>
 where
-    Message: Clone + 'a,
-    Renderer: iced_native::image::Renderer<Handle = Handle> + 'a,
+    Renderer: iced_native::image::Renderer<Handle = Handle>,
     Handle: Clone + Hash + 'a,
 {
-    fn into(self) -> Element<'a, Message, Renderer> {
-        Element::new(self)
+    fn from(image: Image<Handle>) -> Element<'a, Message, Renderer> {
+        Element::new(image)
     }
 }

pure/src/widget/pick_list.rs

@@ -225,16 +225,16 @@ where
     }
 }
 
-impl<'a, T: 'a, Message, Renderer> Into<Element<'a, Message, Renderer>>
-    for PickList<'a, T, Message, Renderer>
+impl<'a, T: 'a, Message, Renderer> From<PickList<'a, T, Message, Renderer>>
+    for Element<'a, Message, Renderer>
 where
     T: Clone + ToString + Eq + 'static,
     [T]: ToOwned<Owned = Vec<T>>,
     Message: 'a,
     Renderer: text::Renderer + 'a,
     Renderer::Theme: StyleSheet,
 {
-    fn into(self) -> Element<'a, Message, Renderer> {
-        Element::new(self)
+    fn from(pick_list: PickList<'a, T, Message, Renderer>) -> Self {
+        Self::new(pick_list)
     }
 }

pure/src/widget/progress_bar.rs

@@ -93,13 +93,16 @@ where
     }
 }
 
-impl<'a, Message, Renderer> Into<Element<'a, Message, Renderer>>
-    for ProgressBar<Renderer>
+impl<'a, Message, Renderer> From<ProgressBar<Renderer>>
+    for Element<'a, Message, Renderer>
 where
-    Renderer: iced_native::Renderer + 'a,
+    Message: 'a,
+    Renderer: 'a + iced_native::Renderer,
     Renderer::Theme: StyleSheet,
 {
-    fn into(self) -> Element<'a, Message, Renderer> {
-        Element::new(self)
+    fn from(
+        progress_bar: ProgressBar<Renderer>,
+    ) -> Element<'a, Message, Renderer> {
+        Element::new(progress_bar)
     }
 }

pure/src/widget/radio.rs

@@ -96,14 +96,14 @@ where
     }
 }
 
-impl<'a, Message, Renderer> Into<Element<'a, Message, Renderer>>
-    for Radio<Message, Renderer>
+impl<'a, Message, Renderer> From<Radio<Message, Renderer>>
+    for Element<'a, Message, Renderer>
 where
     Message: 'a + Clone,
-    Renderer: text::Renderer + 'a,
+    Renderer: 'a + text::Renderer,
     Renderer::Theme: StyleSheet + widget::text::StyleSheet,
 {
-    fn into(self) -> Element<'a, Message, Renderer> {
-        Element::new(self)
+    fn from(radio: Radio<Message, Renderer>) -> Element<'a, Message, Renderer> {
+        Element::new(radio)
     }
 }

pure/src/widget/row.rs

@@ -215,13 +215,13 @@ where
     }
 }
 
-impl<'a, Message, Renderer> Into<Element<'a, Message, Renderer>>
-    for Row<'a, Message, Renderer>
+impl<'a, Message, Renderer> From<Row<'a, Message, Renderer>>
+    for Element<'a, Message, Renderer>
 where
     Message: 'a,
     Renderer: iced_native::Renderer + 'a,
 {
-    fn into(self) -> Element<'a, Message, Renderer> {
-        Element::new(self)
+    fn from(row: Row<'a, Message, Renderer>) -> Self {
+        Self::new(row)
     }
 }

pure/src/widget/rule.rs

@@ -93,13 +93,14 @@ where
     }
 }
 
-impl<'a, Message, Renderer> Into<Element<'a, Message, Renderer>>
-    for Rule<Renderer>
+impl<'a, Message, Renderer> From<Rule<Renderer>>
+    for Element<'a, Message, Renderer>
 where
-    Renderer: iced_native::Renderer + 'a,
+    Message: 'a,
+    Renderer: 'a + iced_native::Renderer,
     Renderer::Theme: StyleSheet,
 {
-    fn into(self) -> Element<'a, Message, Renderer> {
-        Element::new(self)
+    fn from(rule: Rule<Renderer>) -> Element<'a, Message, Renderer> {
+        Element::new(rule)
     }
 }

pure/src/widget/space.rs

@@ -91,11 +91,12 @@ where
     }
 }
 
-impl<'a, Message, Renderer> Into<Element<'a, Message, Renderer>> for Space
+impl<'a, Message, Renderer> From<Space> for Element<'a, Message, Renderer>
 where
-    Renderer: iced_native::Renderer + 'a,
+    Renderer: iced_native::Renderer,
+    Message: 'a,
 {
-    fn into(self) -> Element<'a, Message, Renderer> {
-        Element::new(self)
+    fn from(space: Space) -> Element<'a, Message, Renderer> {
+        Element::new(space)
     }
 }

pure/src/widget/svg.rs

@@ -54,12 +54,11 @@ where
     }
 }
 
-impl<'a, Message, Renderer> Into<Element<'a, Message, Renderer>> for Svg
+impl<'a, Message, Renderer> From<Svg> for Element<'a, Message, Renderer>
 where
-    Message: Clone + 'a,
-    Renderer: iced_native::svg::Renderer + 'a,
+    Renderer: iced_native::svg::Renderer,
 {
-    fn into(self) -> Element<'a, Message, Renderer> {
-        Element::new(self)
+    fn from(icon: Svg) -> Element<'a, Message, Renderer> {
+        Element::new(icon)
     }
 }

pure/src/widget/text.rs

@@ -55,23 +55,23 @@ where
     }
 }
 
-impl<'a, Message, Renderer> Into<Element<'a, Message, Renderer>>
-    for Text<Renderer>
+impl<'a, Message, Renderer> From<Text<Renderer>>
+    for Element<'a, Message, Renderer>
 where
     Renderer: text::Renderer + 'a,
     Renderer::Theme: widget::text::StyleSheet,
 {
-    fn into(self) -> Element<'a, Message, Renderer> {
-        Element::new(self)
+    fn from(text: Text<Renderer>) -> Self {
+        Self::new(text)
     }
 }
 
-impl<'a, Message, Renderer> Into<Element<'a, Message, Renderer>> for &'a str
+impl<'a, Message, Renderer> From<&'a str> for Element<'a, Message, Renderer>
 where
     Renderer: text::Renderer + 'a,
     Renderer::Theme: widget::text::StyleSheet,
 {
-    fn into(self) -> Element<'a, Message, Renderer> {
-        Text::new(self).into()
+    fn from(content: &'a str) -> Self {
+        Element::from(Text::new(content))
     }
 }

pure/src/widget/toggler.rs

@@ -96,14 +96,16 @@ where
     }
 }
 
-impl<'a, Message, Renderer> Into<Element<'a, Message, Renderer>>
-    for Toggler<'a, Message, Renderer>
+impl<'a, Message, Renderer> From<Toggler<'a, Message, Renderer>>
+    for Element<'a, Message, Renderer>
 where
     Message: 'a,
-    Renderer: text::Renderer + 'a,
+    Renderer: 'a + text::Renderer,
     Renderer::Theme: StyleSheet + widget::text::StyleSheet,
 {
-    fn into(self) -> Element<'a, Message, Renderer> {
-        Element::new(self)
+    fn from(
+        toggler: Toggler<'a, Message, Renderer>,
+    ) -> Element<'a, Message, Renderer> {
+        Element::new(toggler)
     }
 }

src/pure.rs

@@ -105,6 +105,7 @@ pub use sandbox::Sandbox;
 
 pub use iced_pure::helpers::*;
 pub use iced_pure::Widget;
+pub use iced_pure::{column, row};
 pub use iced_pure::{Pure, State};
 
 /// A generic, pure [`Widget`].