diff options
author | 2019-09-19 18:47:01 +0200 | |
---|---|---|
committer | 2019-09-19 19:00:42 +0200 | |
commit | b83a4b42dd912b5f59d40e7d4f7f7ccdabc43019 (patch) | |
tree | 58cb04c5e6be38422c8767cabba938edc4988b75 /examples/tour | |
parent | f9de39ddaa3020a9585b1648afb0ead45dfd7aa9 (diff) | |
download | iced-b83a4b42dd912b5f59d40e7d4f7f7ccdabc43019.tar.gz iced-b83a4b42dd912b5f59d40e7d4f7f7ccdabc43019.tar.bz2 iced-b83a4b42dd912b5f59d40e7d4f7f7ccdabc43019.zip |
Remove generic `Color` in widgets
Diffstat (limited to 'examples/tour')
-rw-r--r-- | examples/tour/src/iced_ggez/renderer/debugger.rs | 2 | ||||
-rw-r--r-- | examples/tour/src/iced_ggez/renderer/text.rs | 2 | ||||
-rw-r--r-- | examples/tour/src/iced_ggez/widget.rs | 7 |
3 files changed, 4 insertions, 7 deletions
diff --git a/examples/tour/src/iced_ggez/renderer/debugger.rs b/examples/tour/src/iced_ggez/renderer/debugger.rs index c6727881..eba03ebf 100644 --- a/examples/tour/src/iced_ggez/renderer/debugger.rs +++ b/examples/tour/src/iced_ggez/renderer/debugger.rs @@ -2,8 +2,6 @@ use super::{into_color, Renderer}; use ggez::graphics::{DrawMode, MeshBuilder, Rect}; impl iced::renderer::Debugger for Renderer<'_> { - type Color = iced::Color; - fn explain(&mut self, layout: &iced::Layout<'_>, color: iced::Color) { let bounds = layout.bounds(); diff --git a/examples/tour/src/iced_ggez/renderer/text.rs b/examples/tour/src/iced_ggez/renderer/text.rs index b5010639..450ca2cd 100644 --- a/examples/tour/src/iced_ggez/renderer/text.rs +++ b/examples/tour/src/iced_ggez/renderer/text.rs @@ -5,7 +5,7 @@ use iced::text; use std::cell::RefCell; use std::f32; -impl text::Renderer<iced::Color> for Renderer<'_> { +impl text::Renderer for Renderer<'_> { fn node( &self, style: iced::Style, diff --git a/examples/tour/src/iced_ggez/widget.rs b/examples/tour/src/iced_ggez/widget.rs index a365daca..c9f857f6 100644 --- a/examples/tour/src/iced_ggez/widget.rs +++ b/examples/tour/src/iced_ggez/widget.rs @@ -1,10 +1,9 @@ use super::Renderer; -pub use iced::{button, slider, text, Align, Button, Color, Slider}; +pub use iced::{ + button, slider, text, Align, Button, Checkbox, Color, Radio, Slider, Text, +}; -pub type Text = iced::Text<Color>; -pub type Checkbox<Message> = iced::Checkbox<Color, Message>; -pub type Radio<Message> = iced::Radio<Color, Message>; pub type Image<'a> = iced::Image<&'a str>; pub type Column<'a, Message> = iced::Column<'a, Message, Renderer<'a>>; |