From b72bd0b2b5c9c2a5c3f508a13ad9578169046a36 Mon Sep 17 00:00:00 2001 From: daxpedda Date: Fri, 14 Feb 2020 15:57:07 +0100 Subject: Add `bound` to `Node` constructor. --- native/src/widget/button.rs | 4 ++-- native/src/widget/container.rs | 5 ++--- native/src/widget/image.rs | 2 +- native/src/widget/progress_bar.rs | 2 +- native/src/widget/scrollable.rs | 2 +- native/src/widget/slider.rs | 2 +- native/src/widget/space.rs | 2 +- native/src/widget/svg.rs | 2 +- native/src/widget/text.rs | 2 +- native/src/widget/text_input.rs | 9 +++++++-- 10 files changed, 18 insertions(+), 14 deletions(-) (limited to 'native/src/widget') diff --git a/native/src/widget/button.rs b/native/src/widget/button.rs index 5b0d3e41..73be4d49 100644 --- a/native/src/widget/button.rs +++ b/native/src/widget/button.rs @@ -7,7 +7,7 @@ use crate::{ input::{mouse, ButtonState}, layout, Clipboard, Element, Event, Hasher, Layout, Length, Point, - Rectangle, Widget, + Rectangle, Size, Widget, }; use std::hash::Hash; @@ -174,7 +174,7 @@ where let size = limits.resolve(content.size()).pad(padding); - layout::Node::with_children(size, vec![content]) + layout::Node::with_children(size, Size::ZERO, vec![content]) } fn on_event( diff --git a/native/src/widget/container.rs b/native/src/widget/container.rs index 3459a832..d2065234 100644 --- a/native/src/widget/container.rs +++ b/native/src/widget/container.rs @@ -2,7 +2,7 @@ use std::hash::Hash; use crate::{ - layout, Align, Clipboard, Element, Event, Hasher, Layout, Length, Point, + layout, Align, Clipboard, Size, Element, Event, Hasher, Layout, Length, Point, Rectangle, Widget, }; @@ -77,7 +77,6 @@ where self.max_height = max_height; self } - /// Sets the content alignment for the horizontal axis of the [`Container`]. /// /// [`Container`]: struct.Container.html @@ -149,7 +148,7 @@ where content.align(self.horizontal_alignment, self.vertical_alignment, size); - layout::Node::with_children(size, vec![content]) + layout::Node::with_children(size, Size::ZERO, vec![content]) } fn on_event( diff --git a/native/src/widget/image.rs b/native/src/widget/image.rs index 200401f9..6938f5d5 100644 --- a/native/src/widget/image.rs +++ b/native/src/widget/image.rs @@ -88,7 +88,7 @@ where size.height = height as f32 * size.width / width as f32; } - layout::Node::new(size) + layout::Node::new(size, Size::ZERO) } fn draw( diff --git a/native/src/widget/progress_bar.rs b/native/src/widget/progress_bar.rs index 67d1ab83..d011cc8a 100644 --- a/native/src/widget/progress_bar.rs +++ b/native/src/widget/progress_bar.rs @@ -95,7 +95,7 @@ where let size = limits.resolve(Size::ZERO); - layout::Node::new(size) + layout::Node::new(size, Size::ZERO) } fn draw( diff --git a/native/src/widget/scrollable.rs b/native/src/widget/scrollable.rs index e83f25af..6408a3d2 100644 --- a/native/src/widget/scrollable.rs +++ b/native/src/widget/scrollable.rs @@ -143,7 +143,7 @@ where let content = self.content.layout(renderer, &child_limits); let size = limits.resolve(content.size()); - layout::Node::with_children(size, vec![content]) + layout::Node::with_children(size, Size::ZERO, vec![content]) } fn on_event( diff --git a/native/src/widget/slider.rs b/native/src/widget/slider.rs index 008203fe..c554fb9e 100644 --- a/native/src/widget/slider.rs +++ b/native/src/widget/slider.rs @@ -135,7 +135,7 @@ where let size = limits.resolve(Size::ZERO); - layout::Node::new(size) + layout::Node::new(size, Size::ZERO) } fn on_event( diff --git a/native/src/widget/space.rs b/native/src/widget/space.rs index 24c94bf6..899c258e 100644 --- a/native/src/widget/space.rs +++ b/native/src/widget/space.rs @@ -62,7 +62,7 @@ where ) -> layout::Node { let limits = limits.width(self.width).height(self.height); - layout::Node::new(limits.resolve(Size::ZERO)) + layout::Node::new(limits.resolve(Size::ZERO), Size::ZERO) } fn draw( diff --git a/native/src/widget/svg.rs b/native/src/widget/svg.rs index 063730bb..60d403ef 100644 --- a/native/src/widget/svg.rs +++ b/native/src/widget/svg.rs @@ -85,7 +85,7 @@ where size.height = height as f32 * size.width / width as f32; } - layout::Node::new(size) + layout::Node::new(size, Size::ZERO) } fn draw( diff --git a/native/src/widget/text.rs b/native/src/widget/text.rs index e4490fb6..ef8a9dbc 100644 --- a/native/src/widget/text.rs +++ b/native/src/widget/text.rs @@ -140,7 +140,7 @@ where let size = limits.resolve(Size::new(width, height)); - layout::Node::new(size) + layout::Node::new(size, Size::ZERO) } fn draw( diff --git a/native/src/widget/text_input.rs b/native/src/widget/text_input.rs index 04118755..42aa3d69 100644 --- a/native/src/widget/text_input.rs +++ b/native/src/widget/text_input.rs @@ -183,11 +183,16 @@ where .max_width(self.max_width) .height(Length::Units(text_size)); - let mut text = layout::Node::new(limits.resolve(Size::ZERO)); + let mut text = + layout::Node::new(limits.resolve(Size::ZERO), Size::ZERO); text.bounds.x = padding; text.bounds.y = padding; - layout::Node::with_children(text.size().pad(padding), vec![text]) + layout::Node::with_children( + text.size().pad(padding), + Size::ZERO, + vec![text], + ) } fn on_event( -- cgit From f4b8bce837513cdd06df3a3ceba86fd9256d3cc5 Mon Sep 17 00:00:00 2001 From: daxpedda Date: Fri, 14 Feb 2020 21:41:35 +0100 Subject: Revert changing the constructor and implement new method. --- native/src/widget/button.rs | 8 +++----- native/src/widget/container.rs | 4 ++-- native/src/widget/image.rs | 2 +- native/src/widget/progress_bar.rs | 2 +- native/src/widget/scrollable.rs | 2 +- native/src/widget/slider.rs | 2 +- native/src/widget/space.rs | 2 +- native/src/widget/svg.rs | 2 +- native/src/widget/text.rs | 2 +- native/src/widget/text_input.rs | 14 ++++---------- 10 files changed, 16 insertions(+), 24 deletions(-) (limited to 'native/src/widget') diff --git a/native/src/widget/button.rs b/native/src/widget/button.rs index 73be4d49..f1d46936 100644 --- a/native/src/widget/button.rs +++ b/native/src/widget/button.rs @@ -7,7 +7,7 @@ use crate::{ input::{mouse, ButtonState}, layout, Clipboard, Element, Event, Hasher, Layout, Length, Point, - Rectangle, Size, Widget, + Rectangle, Widget, }; use std::hash::Hash; @@ -168,13 +168,11 @@ 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); - layout::Node::with_children(size, Size::ZERO, vec![content]) + layout::Node::with_children(size, vec![content]) } fn on_event( diff --git a/native/src/widget/container.rs b/native/src/widget/container.rs index d2065234..07bb62c6 100644 --- a/native/src/widget/container.rs +++ b/native/src/widget/container.rs @@ -2,7 +2,7 @@ use std::hash::Hash; use crate::{ - layout, Align, Clipboard, Size, Element, Event, Hasher, Layout, Length, Point, + layout, Align, Clipboard, Element, Event, Hasher, Layout, Length, Point, Rectangle, Widget, }; @@ -148,7 +148,7 @@ where content.align(self.horizontal_alignment, self.vertical_alignment, size); - layout::Node::with_children(size, Size::ZERO, vec![content]) + layout::Node::with_children(size, vec![content]) } fn on_event( diff --git a/native/src/widget/image.rs b/native/src/widget/image.rs index 6938f5d5..200401f9 100644 --- a/native/src/widget/image.rs +++ b/native/src/widget/image.rs @@ -88,7 +88,7 @@ where size.height = height as f32 * size.width / width as f32; } - layout::Node::new(size, Size::ZERO) + layout::Node::new(size) } fn draw( diff --git a/native/src/widget/progress_bar.rs b/native/src/widget/progress_bar.rs index d011cc8a..67d1ab83 100644 --- a/native/src/widget/progress_bar.rs +++ b/native/src/widget/progress_bar.rs @@ -95,7 +95,7 @@ where let size = limits.resolve(Size::ZERO); - layout::Node::new(size, Size::ZERO) + layout::Node::new(size) } fn draw( diff --git a/native/src/widget/scrollable.rs b/native/src/widget/scrollable.rs index 6408a3d2..e83f25af 100644 --- a/native/src/widget/scrollable.rs +++ b/native/src/widget/scrollable.rs @@ -143,7 +143,7 @@ where let content = self.content.layout(renderer, &child_limits); let size = limits.resolve(content.size()); - layout::Node::with_children(size, Size::ZERO, vec![content]) + layout::Node::with_children(size, vec![content]) } fn on_event( diff --git a/native/src/widget/slider.rs b/native/src/widget/slider.rs index c554fb9e..008203fe 100644 --- a/native/src/widget/slider.rs +++ b/native/src/widget/slider.rs @@ -135,7 +135,7 @@ where let size = limits.resolve(Size::ZERO); - layout::Node::new(size, Size::ZERO) + layout::Node::new(size) } fn on_event( diff --git a/native/src/widget/space.rs b/native/src/widget/space.rs index 899c258e..24c94bf6 100644 --- a/native/src/widget/space.rs +++ b/native/src/widget/space.rs @@ -62,7 +62,7 @@ where ) -> layout::Node { let limits = limits.width(self.width).height(self.height); - layout::Node::new(limits.resolve(Size::ZERO), Size::ZERO) + layout::Node::new(limits.resolve(Size::ZERO)) } fn draw( diff --git a/native/src/widget/svg.rs b/native/src/widget/svg.rs index 60d403ef..063730bb 100644 --- a/native/src/widget/svg.rs +++ b/native/src/widget/svg.rs @@ -85,7 +85,7 @@ where size.height = height as f32 * size.width / width as f32; } - layout::Node::new(size, Size::ZERO) + layout::Node::new(size) } fn draw( diff --git a/native/src/widget/text.rs b/native/src/widget/text.rs index ef8a9dbc..e4490fb6 100644 --- a/native/src/widget/text.rs +++ b/native/src/widget/text.rs @@ -140,7 +140,7 @@ where let size = limits.resolve(Size::new(width, height)); - layout::Node::new(size, Size::ZERO) + layout::Node::new(size) } fn draw( diff --git a/native/src/widget/text_input.rs b/native/src/widget/text_input.rs index 42aa3d69..c068b895 100644 --- a/native/src/widget/text_input.rs +++ b/native/src/widget/text_input.rs @@ -183,16 +183,10 @@ where .max_width(self.max_width) .height(Length::Units(text_size)); - let mut text = - layout::Node::new(limits.resolve(Size::ZERO), Size::ZERO); - text.bounds.x = padding; - text.bounds.y = padding; - - layout::Node::with_children( - text.size().pad(padding), - Size::ZERO, - vec![text], - ) + let mut text = layout::Node::new(limits.resolve(Size::ZERO)); + text.move_to(Point::new(padding, padding)); + + layout::Node::with_children(text.size().pad(padding), vec![text]) } fn on_event( -- cgit From ddceb295f43154543b7f90bbd84964ede0901dbd Mon Sep 17 00:00:00 2001 From: daxpedda Date: Fri, 14 Feb 2020 21:43:34 +0100 Subject: Revert rustfmt change. --- native/src/widget/container.rs | 1 + 1 file changed, 1 insertion(+) (limited to 'native/src/widget') diff --git a/native/src/widget/container.rs b/native/src/widget/container.rs index 07bb62c6..3459a832 100644 --- a/native/src/widget/container.rs +++ b/native/src/widget/container.rs @@ -77,6 +77,7 @@ where self.max_height = max_height; self } + /// Sets the content alignment for the horizontal axis of the [`Container`]. /// /// [`Container`]: struct.Container.html -- cgit