From ff2519b1d43d481987351a83b6dd7237524c21f0 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Wed, 27 Jul 2022 06:49:20 +0200 Subject: Replace stateful widgets with new `iced_pure` API --- native/src/widget/text.rs | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'native/src/widget/text.rs') diff --git a/native/src/widget/text.rs b/native/src/widget/text.rs index 8d173b8a..26386505 100644 --- a/native/src/widget/text.rs +++ b/native/src/widget/text.rs @@ -3,6 +3,7 @@ use crate::alignment; use crate::layout; use crate::renderer; use crate::text; +use crate::widget::Tree; use crate::{Element, Layout, Length, Point, Rectangle, Size, Widget}; pub use iced_style::text::{Appearance, StyleSheet}; @@ -145,6 +146,7 @@ where fn draw( &self, + _state: &Tree, renderer: &mut Renderer, theme: &Renderer::Theme, style: &renderer::Style, @@ -243,3 +245,13 @@ where } } } + +impl<'a, Message, Renderer> From<&'a str> for Element<'a, Message, Renderer> +where + Renderer: text::Renderer + 'a, + Renderer::Theme: StyleSheet, +{ + fn from(contents: &'a str) -> Self { + Text::new(contents).into() + } +} -- cgit From a1c5f8839dd972a016e4fd6af3a898c1d8f2684f Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Wed, 27 Jul 2022 06:56:09 +0200 Subject: Use `ToString` for `Text::new` instead of `Into` --- native/src/widget/text.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'native/src/widget/text.rs') diff --git a/native/src/widget/text.rs b/native/src/widget/text.rs index 26386505..b30f4518 100644 --- a/native/src/widget/text.rs +++ b/native/src/widget/text.rs @@ -45,9 +45,9 @@ where Renderer::Theme: StyleSheet, { /// Create a new fragment of [`Text`] with the given contents. - pub fn new>(label: T) -> Self { + pub fn new(label: T) -> Self { Text { - content: label.into(), + content: label.to_string(), size: None, font: Default::default(), width: Length::Shrink, -- cgit