Rename Renderer::Primitive to Renderer::Output

This commit is contained in:
Héctor Ramón Jiménez 2019-10-11 22:15:39 +02:00
parent 650d020fde
commit 8846a239cf
25 changed files with 48 additions and 48 deletions

View file

@ -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>>

View file

@ -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>>

View file

@ -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>>

View file

@ -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>

View file

@ -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>>

View file

@ -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>>

View file

@ -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>>

View file

@ -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>