summaryrefslogtreecommitdiffstats
path: root/native
diff options
context:
space:
mode:
authorLibravatar Héctor Ramón Jiménez <hector0193@gmail.com>2019-10-11 22:15:39 +0200
committerLibravatar Héctor Ramón Jiménez <hector0193@gmail.com>2019-10-11 22:15:39 +0200
commit8846a239cf14edd464b1d09f6d6d57ad9b5c9fc7 (patch)
treeb893c10085e9b6c16b23fd329a1d78d8b13a8e4d /native
parent650d020fde6e684bf3c865de823ace08194b5220 (diff)
downloadiced-8846a239cf14edd464b1d09f6d6d57ad9b5c9fc7.tar.gz
iced-8846a239cf14edd464b1d09f6d6d57ad9b5c9fc7.tar.bz2
iced-8846a239cf14edd464b1d09f6d6d57ad9b5c9fc7.zip
Rename `Renderer::Primitive` to `Renderer::Output`
Diffstat (limited to 'native')
-rw-r--r--native/src/element.rs8
-rw-r--r--native/src/lib.rs2
-rw-r--r--native/src/renderer.rs4
-rw-r--r--native/src/renderer/debugger.rs2
-rw-r--r--native/src/renderer/windowed.rs2
-rw-r--r--native/src/user_interface.rs14
-rw-r--r--native/src/widget.rs2
-rw-r--r--native/src/widget/button.rs4
-rw-r--r--native/src/widget/checkbox.rs4
-rw-r--r--native/src/widget/column.rs4
-rw-r--r--native/src/widget/image.rs5
-rw-r--r--native/src/widget/radio.rs4
-rw-r--r--native/src/widget/row.rs4
-rw-r--r--native/src/widget/slider.rs4
-rw-r--r--native/src/widget/text.rs4
15 files changed, 33 insertions, 34 deletions
diff --git a/native/src/element.rs b/native/src/element.rs
index cf96b7ea..899089b3 100644
--- a/native/src/element.rs
+++ b/native/src/element.rs
@@ -50,7 +50,7 @@ where
renderer: &mut Renderer,
layout: Layout<'_>,
cursor_position: Point,
- ) -> Renderer::Primitive {
+ ) -> Renderer::Output {
self.widget.draw(renderer, layout, cursor_position)
}
@@ -120,7 +120,7 @@ where
/// # };
/// # pub struct Renderer;
/// #
- /// # impl iced_native::Renderer for Renderer { type Primitive = (); }
+ /// # impl iced_native::Renderer for Renderer { type Output = (); }
/// #
/// # impl iced_native::row::Renderer for Renderer {
/// # fn draw<Message>(
@@ -323,7 +323,7 @@ where
renderer: &mut Renderer,
layout: Layout<'_>,
cursor_position: Point,
- ) -> Renderer::Primitive {
+ ) -> Renderer::Output {
self.widget.draw(renderer, layout, cursor_position)
}
@@ -383,7 +383,7 @@ where
renderer: &mut Renderer,
layout: Layout<'_>,
cursor_position: Point,
- ) -> Renderer::Primitive {
+ ) -> Renderer::Output {
renderer.explain(
self.element.widget.as_ref(),
layout,
diff --git a/native/src/lib.rs b/native/src/lib.rs
index cada56f9..fa72a553 100644
--- a/native/src/lib.rs
+++ b/native/src/lib.rs
@@ -83,7 +83,7 @@
//! # pub struct Renderer {}
//! #
//! # impl iced_native::Renderer for Renderer {
-//! # type Primitive = ();
+//! # type Output = ();
//! # }
//! #
//! # impl button::Renderer for Renderer {
diff --git a/native/src/renderer.rs b/native/src/renderer.rs
index a56d7b76..afe1b09a 100644
--- a/native/src/renderer.rs
+++ b/native/src/renderer.rs
@@ -1,7 +1,7 @@
//! Write your own renderer.
//!
//! You will need to implement the `Renderer` trait first. It simply contains
-//! a `Primitive` associated type.
+//! an `Output` associated type.
//!
//! There is no common trait to draw all the widgets. Instead, every [`Widget`]
//! constrains its generic `Renderer` type as necessary.
@@ -27,5 +27,5 @@ pub use debugger::Debugger;
pub use windowed::Windowed;
pub trait Renderer {
- type Primitive;
+ type Output;
}
diff --git a/native/src/renderer/debugger.rs b/native/src/renderer/debugger.rs
index cb472dd4..4cc50661 100644
--- a/native/src/renderer/debugger.rs
+++ b/native/src/renderer/debugger.rs
@@ -21,5 +21,5 @@ pub trait Debugger: super::Renderer {
layout: Layout<'_>,
cursor_position: Point,
color: Color,
- ) -> Self::Primitive;
+ ) -> Self::Output;
}
diff --git a/native/src/renderer/windowed.rs b/native/src/renderer/windowed.rs
index f89da40b..bcf37964 100644
--- a/native/src/renderer/windowed.rs
+++ b/native/src/renderer/windowed.rs
@@ -11,7 +11,7 @@ pub trait Windowed: super::Renderer {
fn draw(
&mut self,
+ output: &Self::Output,
target: &mut Self::Target,
- primitive: &Self::Primitive,
) -> MouseCursor;
}
diff --git a/native/src/user_interface.rs b/native/src/user_interface.rs
index 812ad598..44aaf9e3 100644
--- a/native/src/user_interface.rs
+++ b/native/src/user_interface.rs
@@ -48,7 +48,7 @@ where
/// # pub fn new() -> Self { Renderer }
/// # }
/// #
- /// # impl iced_native::Renderer for Renderer { type Primitive = (); }
+ /// # impl iced_native::Renderer for Renderer { type Output = (); }
/// #
/// # impl iced_native::column::Renderer for Renderer {
/// # fn draw<Message>(
@@ -56,7 +56,7 @@ where
/// # _column: &iced_native::Column<'_, Message, Self>,
/// # _layout: iced_native::Layout<'_>,
/// # _cursor_position: iced_native::Point,
- /// # ) -> Self::Primitive {
+ /// # ) -> Self::Output {
/// # ()
/// # }
/// # }
@@ -144,7 +144,7 @@ where
/// # pub fn new() -> Self { Renderer }
/// # }
/// #
- /// # impl iced_native::Renderer for Renderer { type Primitive = (); }
+ /// # impl iced_native::Renderer for Renderer { type Output = (); }
/// #
/// # impl iced_native::column::Renderer for Renderer {
/// # fn draw<Message>(
@@ -152,7 +152,7 @@ where
/// # _column: &iced_native::Column<'_, Message, Self>,
/// # _layout: iced_native::Layout<'_>,
/// # _cursor_position: iced_native::Point,
- /// # ) -> Self::Primitive {
+ /// # ) -> Self::Output {
/// # ()
/// # }
/// # }
@@ -242,7 +242,7 @@ where
/// # pub fn new() -> Self { Renderer }
/// # }
/// #
- /// # impl iced_native::Renderer for Renderer { type Primitive = (); }
+ /// # impl iced_native::Renderer for Renderer { type Output = (); }
/// #
/// # impl iced_native::column::Renderer for Renderer {
/// # fn draw<Message>(
@@ -250,7 +250,7 @@ where
/// # _column: &iced_native::Column<'_, Message, Self>,
/// # _layout: iced_native::Layout<'_>,
/// # _cursor_position: iced_native::Point,
- /// # ) -> Self::Primitive {
+ /// # ) -> Self::Output {
/// # ()
/// # }
/// # }
@@ -296,7 +296,7 @@ where
/// // Flush rendering operations...
/// }
/// ```
- pub fn draw(&self, renderer: &mut Renderer) -> Renderer::Primitive {
+ pub fn draw(&self, renderer: &mut Renderer) -> Renderer::Output {
self.root.widget.draw(
renderer,
Layout::new(&self.layout),
diff --git a/native/src/widget.rs b/native/src/widget.rs
index b7181c1b..bcef2665 100644
--- a/native/src/widget.rs
+++ b/native/src/widget.rs
@@ -77,7 +77,7 @@ where
renderer: &mut Renderer,
layout: Layout<'_>,
cursor_position: Point,
- ) -> Renderer::Primitive;
+ ) -> Renderer::Output;
/// Computes the _layout_ hash of the [`Widget`].
///
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>
generated by cgit (git 2.34.1) at 2025-04-12 06:13:05 +0000