Merge branch 'master' into feature/canvas

native/src/layout/flex.rs

@@ -18,7 +18,7 @@
 // limitations under the License.
 use crate::{
     layout::{Limits, Node},
-    Align, Element, Size,
+    Align, Element, Point, Size,
 };
 
 /// The main axis of a flex layout.
@@ -152,8 +152,7 @@ where
 
         let (x, y) = axis.pack(main, padding);
 
-        node.bounds.x = x;
+        node.move_to(Point::new(x, y));
-        node.bounds.y = y;
 
         match axis {
             Axis::Horizontal => {

native/src/layout/node.rs

@@ -1,9 +1,9 @@
-use crate::{Align, Rectangle, Size};
+use crate::{Align, Point, Rectangle, Size};
 
 /// The bounds of an element and its children.
 #[derive(Debug, Clone, Default)]
 pub struct Node {
-    pub(crate) bounds: Rectangle,
+    bounds: Rectangle,
     children: Vec<Node>,
 }
 
@@ -54,7 +54,10 @@ impl Node {
         &self.children
     }
 
-    pub(crate) fn align(
+    /// Aligns the [`Node`] in the given space.
+    ///
+    /// [`Node`]: struct.Node.html
+    pub fn align(
         &mut self,
         horizontal_alignment: Align,
         vertical_alignment: Align,
@@ -80,4 +83,12 @@ impl Node {
             }
         }
     }
+
+    /// Moves the [`Node`] to the given position.
+    ///
+    /// [`Node`]: struct.Node.html
+    pub fn move_to(&mut self, position: Point) {
+        self.bounds.x = position.x;
+        self.bounds.y = position.y;
+    }
 }

native/src/widget/button.rs

@@ -168,9 +168,7 @@ where
             .pad(padding);
 
         let mut content = self.content.layout(renderer, &limits);
-
+        content.move_to(Point::new(padding, padding));
-        content.bounds.x = padding;
-        content.bounds.y = padding;
 
         let size = limits.resolve(content.size()).pad(padding);
 

native/src/widget/container.rs

@@ -77,6 +77,22 @@ where
         self.max_height = max_height;
         self
     }
+    
+    /// Sets the content alignment for the horizontal axis of the [`Container`].
+    ///
+    /// [`Container`]: struct.Container.html
+    pub fn align_x(mut self, alignment: Align) -> Self {
+        self.horizontal_alignment = alignment;
+        self
+    }
+
+    /// Sets the content alignment for the vertical axis of the [`Container`].
+    ///
+    /// [`Container`]: struct.Container.html
+    pub fn align_y(mut self, alignment: Align) -> Self {
+        self.vertical_alignment = alignment;
+        self
+    }
 
     /// Centers the contents in the horizontal axis of the [`Container`].
     ///

native/src/widget/text_input.rs

@@ -184,8 +184,7 @@ where
             .height(Length::Units(text_size));
 
         let mut text = layout::Node::new(limits.resolve(Size::ZERO));
-        text.bounds.x = padding;
+        text.move_to(Point::new(padding, padding));
-        text.bounds.y = padding;
 
         layout::Node::with_children(text.size().pad(padding), vec![text])
     }