diff options
author | 2019-09-19 18:47:01 +0200 | |
---|---|---|
committer | 2019-09-19 19:00:42 +0200 | |
commit | b83a4b42dd912b5f59d40e7d4f7f7ccdabc43019 (patch) | |
tree | 58cb04c5e6be38422c8767cabba938edc4988b75 /src/element.rs | |
parent | f9de39ddaa3020a9585b1648afb0ead45dfd7aa9 (diff) | |
download | iced-b83a4b42dd912b5f59d40e7d4f7f7ccdabc43019.tar.gz iced-b83a4b42dd912b5f59d40e7d4f7f7ccdabc43019.tar.bz2 iced-b83a4b42dd912b5f59d40e7d4f7f7ccdabc43019.zip |
Remove generic `Color` in widgets
Diffstat (limited to 'src/element.rs')
-rw-r--r-- | src/element.rs | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/element.rs b/src/element.rs index c13bf4a0..f6276fbf 100644 --- a/src/element.rs +++ b/src/element.rs @@ -1,7 +1,7 @@ use stretch::{geometry, result}; use crate::{ - renderer, Event, Hasher, Layout, MouseCursor, Node, Point, Widget, + renderer, Color, Event, Hasher, Layout, MouseCursor, Node, Point, Widget, }; /// A generic [`Widget`]. @@ -210,16 +210,16 @@ impl<'a, Message, Renderer> Element<'a, Message, Renderer> { /// /// [`Element`]: struct.Element.html /// [`Renderer`]: trait.Renderer.html - pub fn explain( + pub fn explain<C: Into<Color>>( self, - color: Renderer::Color, + color: C, ) -> Element<'a, Message, Renderer> where Message: 'static, Renderer: 'a + renderer::Debugger, { Element { - widget: Box::new(Explain::new(self, color)), + widget: Box::new(Explain::new(self, color.into())), } } @@ -309,7 +309,7 @@ where struct Explain<'a, Message, Renderer: renderer::Debugger> { element: Element<'a, Message, Renderer>, - color: Renderer::Color, + color: Color, } impl<'a, Message, Renderer> std::fmt::Debug for Explain<'a, Message, Renderer> @@ -327,10 +327,7 @@ impl<'a, Message, Renderer> Explain<'a, Message, Renderer> where Renderer: renderer::Debugger, { - fn new( - element: Element<'a, Message, Renderer>, - color: Renderer::Color, - ) -> Self { + fn new(element: Element<'a, Message, Renderer>, color: Color) -> Self { Explain { element, color } } } |