From b3a01973c6c726e6539be959659f4306ef3234c6 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Sun, 31 Oct 2021 16:13:03 +0700
Subject: Introduce first-class `text` module in `iced_native`

---
 native/src/widget/radio.rs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'native/src/widget/radio.rs')

diff --git a/native/src/widget/radio.rs b/native/src/widget/radio.rs
index 91de8be5..afe85b76 100644
--- a/native/src/widget/radio.rs
+++ b/native/src/widget/radio.rs
@@ -6,9 +6,9 @@ use crate::event::{self, Event};
 use crate::layout;
 use crate::mouse;
 use crate::renderer;
+use crate::text;
 use crate::touch;
-use crate::widget::text;
-use crate::widget::{Row, Text};
+use crate::widget::{self, Row, Text};
 use crate::{
     Alignment, Background, Clipboard, Color, Element, Hasher, Layout, Length,
     Point, Rectangle, Widget,
@@ -43,7 +43,7 @@ pub use iced_style::radio::{Style, StyleSheet};
 ///
 /// ![Radio buttons drawn by `iced_wgpu`](https://github.com/hecrj/iced/blob/7760618fb112074bc40b148944521f312152012a/docs/images/radio.png?raw=true)
 #[allow(missing_debug_implementations)]
-pub struct Radio<'a, Message, Renderer: renderer::Text> {
+pub struct Radio<'a, Message, Renderer: text::Renderer> {
     is_selected: bool,
     on_click: Message,
     label: String,
@@ -56,7 +56,7 @@ pub struct Radio<'a, Message, Renderer: renderer::Text> {
     style_sheet: &'a dyn StyleSheet,
 }
 
-impl<'a, Message, Renderer: renderer::Text> Radio<'a, Message, Renderer>
+impl<'a, Message, Renderer: text::Renderer> Radio<'a, Message, Renderer>
 where
     Message: Clone,
 {
@@ -145,7 +145,7 @@ impl<'a, Message, Renderer> Widget<Message, Renderer>
     for Radio<'a, Message, Renderer>
 where
     Message: Clone,
-    Renderer: renderer::Text,
+    Renderer: text::Renderer,
 {
     fn width(&self) -> Length {
         self.width
@@ -267,7 +267,7 @@ where
         {
             let label_layout = children.next().unwrap();
 
-            text::draw(
+            widget::text::draw(
                 renderer,
                 style,
                 label_layout,
@@ -293,7 +293,7 @@ impl<'a, Message, Renderer> From<Radio<'a, Message, Renderer>>
     for Element<'a, Message, Renderer>
 where
     Message: 'a + Clone,
-    Renderer: 'a + renderer::Text,
+    Renderer: 'a + text::Renderer,
 {
     fn from(
         radio: Radio<'a, Message, Renderer>,
-- 
cgit