Introduce first-class `text` module in `iced_native`

3 files changed, 18 insertions, 22 deletions

diff --git a/native/src/renderer.rs b/native/src/renderer.rs
index 6d12edae..1e518936 100644
--- a/native/src/renderer.rs
+++ b/native/src/renderer.rs
@@ -19,10 +19,6 @@
 //! [`text::Renderer`]: crate::widget::text::Renderer
 //! [`Checkbox`]: crate::widget::Checkbox
 //! [`checkbox::Renderer`]: crate::widget::checkbox::Renderer
-pub mod text;
-
-pub use text::Text;
-
 #[cfg(debug_assertions)]
 mod null;
 #[cfg(debug_assertions)]
diff --git a/native/src/renderer/null.rs b/native/src/renderer/null.rs
index e57841f4..263b38a9 100644
--- a/native/src/renderer/null.rs
+++ b/native/src/renderer/null.rs
@@ -1,5 +1,5 @@
 use crate::renderer::{self, Renderer};
-use crate::widget::text;
+use crate::text::{self, Text};
 use crate::{Font, Point, Rectangle, Size, Vector};
 
 /// A renderer that does nothing.
@@ -30,7 +30,7 @@ impl Renderer for Null {
     fn fill_rectangle(&mut self, _quad: renderer::Quad) {}
 }
 
-impl renderer::Text for Null {
+impl text::Renderer for Null {
     type Font = Font;
 
     const ICON_FONT: Font = Font::Default;
@@ -63,5 +63,5 @@ impl renderer::Text for Null {
         None
     }
 
-    fn fill_text(&mut self, _text: renderer::text::Section<'_, Self::Font>) {}
+    fn fill_text(&mut self, _text: Text<'_, Self::Font>) {}
 }
diff --git a/native/src/renderer/text.rs b/native/src/text.rs
index fc1a2c66..f112a8f3 100644
--- a/native/src/renderer/text.rs
+++ b/native/src/text.rs
@@ -1,9 +1,20 @@
 use crate::alignment;
-use crate::{Color, Point, Rectangle, Renderer, Size};
+use crate::{Color, Point, Rectangle, Size};
 
-pub use crate::widget::text::Hit;
+pub use iced_core::text::Hit;
 
-pub trait Text: Renderer {
+#[derive(Debug, Clone, Copy)]
+pub struct Text<'a, Font> {
+    pub content: &'a str,
+    pub bounds: Rectangle,
+    pub size: f32,
+    pub color: Color,
+    pub font: Font,
+    pub horizontal_alignment: alignment::Horizontal,
+    pub vertical_alignment: alignment::Vertical,
+}
+
+pub trait Renderer: crate::Renderer {
     /// The font type used.
     type Font: Default + Copy;
 
@@ -56,16 +67,5 @@ pub trait Text: Renderer {
         nearest_only: bool,
     ) -> Option<Hit>;
 
-    fn fill_text(&mut self, section: Section<'_, Self::Font>);
-}
-
-#[derive(Debug, Clone, Copy)]
-pub struct Section<'a, Font> {
-    pub content: &'a str,
-    pub bounds: Rectangle,
-    pub size: f32,
-    pub color: Color,
-    pub font: Font,
-    pub horizontal_alignment: alignment::Horizontal,
-    pub vertical_alignment: alignment::Vertical,
+    fn fill_text(&mut self, text: Text<'_, Self::Font>);
 }