diff options
| -rw-r--r-- | native/src/layout/flex.rs | 5 | ||||
| -rw-r--r-- | native/src/layout/node.rs | 17 | ||||
| -rw-r--r-- | native/src/widget/button.rs | 4 | ||||
| -rw-r--r-- | native/src/widget/text_input.rs | 3 |
4 files changed, 18 insertions, 11 deletions
diff --git a/native/src/layout/flex.rs b/native/src/layout/flex.rs index bd37b75a..2f65f1c1 100644 --- a/native/src/layout/flex.rs +++ b/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.bounds.y = y; + node.move_to(Point::new(x, y)); match axis { Axis::Horizontal => { diff --git a/native/src/layout/node.rs b/native/src/layout/node.rs index ed1cd3da..11e93b72 100644 --- a/native/src/layout/node.rs +++ b/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; + } } diff --git a/native/src/widget/button.rs b/native/src/widget/button.rs index 5b0d3e41..f1d46936 100644 --- a/native/src/widget/button.rs +++ b/native/src/widget/button.rs @@ -168,9 +168,7 @@ where .pad(padding); let mut content = self.content.layout(renderer, &limits); - - content.bounds.x = padding; - content.bounds.y = padding; + content.move_to(Point::new(padding, padding)); let size = limits.resolve(content.size()).pad(padding); diff --git a/native/src/widget/text_input.rs b/native/src/widget/text_input.rs index 04118755..c068b895 100644 --- a/native/src/widget/text_input.rs +++ b/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.bounds.y = padding; + text.move_to(Point::new(padding, padding)); layout::Node::with_children(text.size().pad(padding), vec![text]) } |