Merge branch 'master' into improvement/update-wgpu_glyph

1 files changed, 15 insertions, 4 deletions

diff --git a/wgpu/src/renderer/widget/text.rs b/graphics/src/widget/text.rs
index 4605ed06..327f8e29 100644
--- a/wgpu/src/renderer/widget/text.rs
+++ b/graphics/src/widget/text.rs
@@ -1,12 +1,23 @@
+//! Write some text for your users to read.
+use crate::backend::{self, Backend};
 use crate::{Primitive, Renderer};
+use iced_native::mouse;
+use iced_native::text;
 use iced_native::{
-    mouse, text, Color, Font, HorizontalAlignment, Rectangle, Size,
-    VerticalAlignment,
+    Color, Font, HorizontalAlignment, Rectangle, Size, VerticalAlignment,
 };
 
+/// A paragraph of text.
+///
+/// This is an alias of an `iced_native` text with an `iced_wgpu::Renderer`.
+pub type Text<Backend> = iced_native::Text<Renderer<Backend>>;
+
 use std::f32;
 
-impl text::Renderer for Renderer {
+impl<B> text::Renderer for Renderer<B>
+where
+    B: Backend + backend::Text,
+{
     type Font = Font;
 
     const DEFAULT_SIZE: u16 = 20;
@@ -18,7 +29,7 @@ impl text::Renderer for Renderer {
         font: Font,
         bounds: Size,
     ) -> (f32, f32) {
-        self.text_pipeline
+        self.backend()
             .measure(content, f32::from(size), font, bounds)
     }