diff options
author | 2019-10-11 22:15:39 +0200 | |
---|---|---|
committer | 2019-10-11 22:15:39 +0200 | |
commit | 8846a239cf14edd464b1d09f6d6d57ad9b5c9fc7 (patch) | |
tree | b893c10085e9b6c16b23fd329a1d78d8b13a8e4d /native/src/widget | |
parent | 650d020fde6e684bf3c865de823ace08194b5220 (diff) | |
download | iced-8846a239cf14edd464b1d09f6d6d57ad9b5c9fc7.tar.gz iced-8846a239cf14edd464b1d09f6d6d57ad9b5c9fc7.tar.bz2 iced-8846a239cf14edd464b1d09f6d6d57ad9b5c9fc7.zip |
Rename `Renderer::Primitive` to `Renderer::Output`
Diffstat (limited to 'native/src/widget')
-rw-r--r-- | native/src/widget/button.rs | 4 | ||||
-rw-r--r-- | native/src/widget/checkbox.rs | 4 | ||||
-rw-r--r-- | native/src/widget/column.rs | 4 | ||||
-rw-r--r-- | native/src/widget/image.rs | 5 | ||||
-rw-r--r-- | native/src/widget/radio.rs | 4 | ||||
-rw-r--r-- | native/src/widget/row.rs | 4 | ||||
-rw-r--r-- | native/src/widget/slider.rs | 4 | ||||
-rw-r--r-- | native/src/widget/text.rs | 4 |
8 files changed, 16 insertions, 17 deletions
diff --git a/native/src/widget/button.rs b/native/src/widget/button.rs index 1f881660..4ab59f7f 100644 --- a/native/src/widget/button.rs +++ b/native/src/widget/button.rs @@ -67,7 +67,7 @@ where renderer: &mut Renderer, layout: Layout<'_>, cursor_position: Point, - ) -> Renderer::Primitive { + ) -> Renderer::Output { renderer.draw(&self, layout, cursor_position) } @@ -100,7 +100,7 @@ pub trait Renderer: crate::Renderer + Sized { button: &Button<'_, Message, Self>, layout: Layout<'_>, cursor_position: Point, - ) -> Self::Primitive; + ) -> Self::Output; } impl<'a, Message, Renderer> From<Button<'a, Message, Renderer>> diff --git a/native/src/widget/checkbox.rs b/native/src/widget/checkbox.rs index c069bfdc..cb2baedd 100644 --- a/native/src/widget/checkbox.rs +++ b/native/src/widget/checkbox.rs @@ -43,7 +43,7 @@ where renderer: &mut Renderer, layout: Layout<'_>, cursor_position: Point, - ) -> Renderer::Primitive { + ) -> Renderer::Output { renderer.draw(&self, layout, cursor_position) } @@ -80,7 +80,7 @@ pub trait Renderer: crate::Renderer { checkbox: &Checkbox<Message>, layout: Layout<'_>, cursor_position: Point, - ) -> Self::Primitive; + ) -> Self::Output; } impl<'a, Message, Renderer> From<Checkbox<Message>> diff --git a/native/src/widget/column.rs b/native/src/widget/column.rs index 7e10e662..7995cf5d 100644 --- a/native/src/widget/column.rs +++ b/native/src/widget/column.rs @@ -70,7 +70,7 @@ where renderer: &mut Renderer, layout: Layout<'_>, cursor_position: Point, - ) -> Renderer::Primitive { + ) -> Renderer::Output { renderer.draw(&self, layout, cursor_position) } @@ -97,7 +97,7 @@ pub trait Renderer: crate::Renderer + Sized { row: &Column<'_, Message, Self>, layout: Layout<'_>, cursor_position: Point, - ) -> Self::Primitive; + ) -> Self::Output; } impl<'a, Message, Renderer> From<Column<'a, Message, Renderer>> diff --git a/native/src/widget/image.rs b/native/src/widget/image.rs index 5197d5b1..178dd709 100644 --- a/native/src/widget/image.rs +++ b/native/src/widget/image.rs @@ -20,7 +20,7 @@ where renderer: &mut Renderer, layout: Layout<'_>, _cursor_position: Point, - ) -> Renderer::Primitive { + ) -> Renderer::Output { renderer.draw(&self, layout) } @@ -50,8 +50,7 @@ pub trait Renderer<I>: crate::Renderer { /// Draws an [`Image`]. /// /// [`Image`]: struct.Image.html - fn draw(&mut self, image: &Image<I>, layout: Layout<'_>) - -> Self::Primitive; + fn draw(&mut self, image: &Image<I>, layout: Layout<'_>) -> Self::Output; } impl<'a, I, Message, Renderer> From<Image<I>> for Element<'a, Message, Renderer> diff --git a/native/src/widget/radio.rs b/native/src/widget/radio.rs index 22308f81..27b8f8a8 100644 --- a/native/src/widget/radio.rs +++ b/native/src/widget/radio.rs @@ -40,7 +40,7 @@ where renderer: &mut Renderer, layout: Layout<'_>, cursor_position: Point, - ) -> Renderer::Primitive { + ) -> Renderer::Output { renderer.draw(&self, layout, cursor_position) } @@ -77,7 +77,7 @@ pub trait Renderer: crate::Renderer { radio: &Radio<Message>, layout: Layout<'_>, cursor_position: Point, - ) -> Self::Primitive; + ) -> Self::Output; } impl<'a, Message, Renderer> From<Radio<Message>> diff --git a/native/src/widget/row.rs b/native/src/widget/row.rs index b1d4a5b2..5ec27159 100644 --- a/native/src/widget/row.rs +++ b/native/src/widget/row.rs @@ -70,7 +70,7 @@ where renderer: &mut Renderer, layout: Layout<'_>, cursor_position: Point, - ) -> Renderer::Primitive { + ) -> Renderer::Output { renderer.draw(&self, layout, cursor_position) } @@ -98,7 +98,7 @@ pub trait Renderer: crate::Renderer + Sized { row: &Row<'_, Message, Self>, layout: Layout<'_>, cursor_position: Point, - ) -> Self::Primitive; + ) -> Self::Output; } impl<'a, Message, Renderer> From<Row<'a, Message, Renderer>> diff --git a/native/src/widget/slider.rs b/native/src/widget/slider.rs index 643efdf4..d643d902 100644 --- a/native/src/widget/slider.rs +++ b/native/src/widget/slider.rs @@ -71,7 +71,7 @@ where renderer: &mut Renderer, layout: Layout<'_>, cursor_position: Point, - ) -> Renderer::Primitive { + ) -> Renderer::Output { renderer.draw(&self, layout, cursor_position) } @@ -111,7 +111,7 @@ pub trait Renderer: crate::Renderer { slider: &Slider<'_, Message>, layout: Layout<'_>, cursor_position: Point, - ) -> Self::Primitive; + ) -> Self::Output; } impl<'a, Message, Renderer> From<Slider<'a, Message>> diff --git a/native/src/widget/text.rs b/native/src/widget/text.rs index 62f2d7b7..e389e1d9 100644 --- a/native/src/widget/text.rs +++ b/native/src/widget/text.rs @@ -18,7 +18,7 @@ where renderer: &mut Renderer, layout: Layout<'_>, _cursor_position: Point, - ) -> Renderer::Primitive { + ) -> Renderer::Output { renderer.draw(&self, layout) } @@ -64,7 +64,7 @@ pub trait Renderer: crate::Renderer { /// [`Text`]: struct.Text.html /// [`HorizontalAlignment`]: enum.HorizontalAlignment.html /// [`VerticalAlignment`]: enum.VerticalAlignment.html - fn draw(&mut self, text: &Text, layout: Layout<'_>) -> Self::Primitive; + fn draw(&mut self, text: &Text, layout: Layout<'_>) -> Self::Output; } impl<'a, Message, Renderer> From<Text> for Element<'a, Message, Renderer> |