From f0b1e65ba4f8df173f8201585a1d81245e93ab94 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Wed, 13 Nov 2019 03:54:36 +0100
Subject: Move text logic in `iced_wgpu` to a `text` module

---
 wgpu/src/renderer/widget/text.rs | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to 'wgpu/src/renderer/widget/text.rs')

diff --git a/wgpu/src/renderer/widget/text.rs b/wgpu/src/renderer/widget/text.rs
index b9ccd787..65b23c5e 100644
--- a/wgpu/src/renderer/widget/text.rs
+++ b/wgpu/src/renderer/widget/text.rs
@@ -1,7 +1,7 @@
 use crate::{Primitive, Renderer};
 use iced_native::{layout, text, Color, Layout, MouseCursor, Size, Text};
 
-use wgpu_glyph::{GlyphCruncher, Section};
+use wgpu_glyph::Section;
 
 use std::f32;
 
@@ -21,13 +21,7 @@ impl text::Renderer for Renderer {
             ..Default::default()
         };
 
-        let (width, height) = if let Some(bounds) =
-            self.text_measurements.borrow_mut().glyph_bounds(&section)
-        {
-            (bounds.width().ceil(), bounds.height().ceil())
-        } else {
-            (0.0, 0.0)
-        };
+        let (width, height) = self.text_pipeline.measure(&section);
 
         let size = limits.resolve(Size::new(width, height));
 
-- 
cgit