From 664251f3f5c7b76f69a97683af1468094bba887f Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Sat, 14 May 2022 01:47:55 +0200 Subject: Draft first-class `Theme` support RFC: https://github.com/iced-rs/rfcs/pull/6 --- pure/src/widget/radio.rs | 2 ++ 1 file changed, 2 insertions(+) (limited to 'pure/src/widget/radio.rs') diff --git a/pure/src/widget/radio.rs b/pure/src/widget/radio.rs index 7c98c937..c92c8dbc 100644 --- a/pure/src/widget/radio.rs +++ b/pure/src/widget/radio.rs @@ -60,6 +60,7 @@ where &self, _tree: &Tree, renderer: &mut Renderer, + theme: &Renderer::Theme, style: &renderer::Style, layout: Layout<'_>, cursor_position: Point, @@ -68,6 +69,7 @@ where >::draw( self, renderer, + theme, style, layout, cursor_position, -- cgit From 28d09bfff1dde55190986bab10d7aaeb0ceb49de Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Fri, 27 May 2022 01:26:57 +0200 Subject: Implement theme styling for `Radio` --- pure/src/widget/radio.rs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'pure/src/widget/radio.rs') diff --git a/pure/src/widget/radio.rs b/pure/src/widget/radio.rs index c92c8dbc..9a8885e0 100644 --- a/pure/src/widget/radio.rs +++ b/pure/src/widget/radio.rs @@ -9,13 +9,13 @@ use iced_native::renderer; use iced_native::text; use iced_native::{Clipboard, Length, Point, Rectangle, Shell}; -pub use iced_native::widget::radio::{Radio, Style, StyleSheet}; +pub use iced_native::widget::radio::{Appearance, Radio, StyleSheet}; -impl<'a, Message, Renderer> Widget - for Radio<'a, Message, Renderer> +impl Widget for Radio where Message: Clone, Renderer: text::Renderer, + Renderer::Theme: StyleSheet, { fn width(&self) -> Length { >::width(self) @@ -96,10 +96,11 @@ where } impl<'a, Message, Renderer> Into> - for Radio<'a, Message, Renderer> + for Radio where Message: 'a + Clone, Renderer: text::Renderer + 'a, + Renderer::Theme: StyleSheet, { fn into(self) -> Element<'a, Message, Renderer> { Element::new(self) -- cgit From 1dd1a2f97fc747e15e12b5188dad6c41b0d052ea Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Wed, 29 Jun 2022 10:51:01 +0200 Subject: Introduce `StyleSheet` for `Text` widget --- pure/src/widget/radio.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'pure/src/widget/radio.rs') diff --git a/pure/src/widget/radio.rs b/pure/src/widget/radio.rs index 9a8885e0..7a6ffbac 100644 --- a/pure/src/widget/radio.rs +++ b/pure/src/widget/radio.rs @@ -7,6 +7,7 @@ use iced_native::layout::{self, Layout}; use iced_native::mouse; use iced_native::renderer; use iced_native::text; +use iced_native::widget; use iced_native::{Clipboard, Length, Point, Rectangle, Shell}; pub use iced_native::widget::radio::{Appearance, Radio, StyleSheet}; @@ -15,7 +16,7 @@ impl Widget for Radio where Message: Clone, Renderer: text::Renderer, - Renderer::Theme: StyleSheet, + Renderer::Theme: StyleSheet + widget::text::StyleSheet, { fn width(&self) -> Length { >::width(self) @@ -100,7 +101,7 @@ impl<'a, Message, Renderer> Into> where Message: 'a + Clone, Renderer: text::Renderer + 'a, - Renderer::Theme: StyleSheet, + Renderer::Theme: StyleSheet + widget::text::StyleSheet, { fn into(self) -> Element<'a, Message, Renderer> { Element::new(self) -- cgit