Fix text::State downcast in some widgets

iced-rs · Jul 18, 2024 · c851e67 · c851e67
1 parent 1d1a5f1
commit c851e67
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/core/src/widget/text.rs b/core/src/widget/text.rs
@@ -154,7 +154,7 @@ where
 
 /// The internal state of a [`Text`] widget.
 #[derive(Debug, Default)]
-pub struct State<P: Paragraph>(paragraph::Plain<P>);
+pub struct State<P: Paragraph>(pub paragraph::Plain<P>);
 
 impl<'a, Message, Theme, Renderer> Widget<Message, Theme, Renderer>
     for Text<'a, Theme, Renderer>

diff --git a/widget/src/checkbox.rs b/widget/src/checkbox.rs
@@ -358,12 +358,14 @@ where
 
         {
             let label_layout = children.next().unwrap();
+            let state: &widget::text::State<Renderer::Paragraph> =
+                tree.state.downcast_ref();
 
             crate::text::draw(
                 renderer,
                 defaults,
                 label_layout,
-                tree.state.downcast_ref(),
+                state.0.raw(),
                 crate::text::Style {
                     color: style.text_color,
                 },

diff --git a/widget/src/radio.rs b/widget/src/radio.rs
@@ -353,12 +353,14 @@ where
 
         {
             let label_layout = children.next().unwrap();
+            let state: &widget::text::State<Renderer::Paragraph> =
+                tree.state.downcast_ref();
 
             crate::text::draw(
                 renderer,
                 defaults,
                 label_layout,
-                tree.state.downcast_ref(),
+                state.0.raw(),
                 crate::text::Style {
                     color: style.text_color,
                 },

diff --git a/widget/src/toggler.rs b/widget/src/toggler.rs
@@ -289,12 +289,14 @@ where
 
         if self.label.is_some() {
             let label_layout = children.next().unwrap();
+            let state: &widget::text::State<Renderer::Paragraph> =
+                tree.state.downcast_ref();
 
             crate::text::draw(
                 renderer,
                 style,
                 label_layout,
-                tree.state.downcast_ref(),
+                state.0.raw(),
                 crate::text::Style::default(),
                 viewport,
             );