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`

---
 graphics/src/backend.rs  | 2 +-
 graphics/src/renderer.rs | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'graphics')

diff --git a/graphics/src/backend.rs b/graphics/src/backend.rs
index 4692ced1..533ac15f 100644
--- a/graphics/src/backend.rs
+++ b/graphics/src/backend.rs
@@ -1,7 +1,7 @@
 //! Write a graphics backend.
+use iced_native::text;
 use iced_native::widget::image;
 use iced_native::widget::svg;
-use iced_native::widget::text;
 use iced_native::{Font, Point, Size};
 
 /// The graphics backend of a [`Renderer`].
diff --git a/graphics/src/renderer.rs b/graphics/src/renderer.rs
index 8b6c2217..125962ba 100644
--- a/graphics/src/renderer.rs
+++ b/graphics/src/renderer.rs
@@ -2,6 +2,7 @@ use crate::backend::{self, Backend};
 use crate::{Primitive, Vector};
 use iced_native::layout;
 use iced_native::renderer;
+use iced_native::text::{self, Text};
 use iced_native::{Element, Font, Point, Rectangle, Size};
 
 pub use iced_native::renderer::Style;
@@ -104,7 +105,7 @@ where
     }
 }
 
-impl<B> renderer::Text for Renderer<B>
+impl<B> text::Renderer for Renderer<B>
 where
     B: Backend + backend::Text,
 {
@@ -137,7 +138,7 @@ where
         bounds: Size,
         point: Point,
         nearest_only: bool,
-    ) -> Option<renderer::text::Hit> {
+    ) -> Option<text::Hit> {
         self.backend().hit_test(
             content,
             size,
@@ -148,7 +149,7 @@ where
         )
     }
 
-    fn fill_text(&mut self, text: renderer::text::Section<'_, Self::Font>) {
+    fn fill_text(&mut self, text: Text<'_, Self::Font>) {
         self.primitives.push(Primitive::Text {
             content: text.content.to_string(),
             bounds: text.bounds,
-- 
cgit