From 860a6923bbed57a21ce4b2cae331f6a3a51ca3fe Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Mon, 11 Nov 2019 06:07:31 +0100
Subject: Split text measurements cache from rendering cache

This speeds up layouting in the most common scenario considerably!
:tada:
---
 wgpu/src/renderer/widget/text.rs       | 2 +-
 wgpu/src/renderer/widget/text_input.rs | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'wgpu/src/renderer/widget')

diff --git a/wgpu/src/renderer/widget/text.rs b/wgpu/src/renderer/widget/text.rs
index 713b514f..b9ccd787 100644
--- a/wgpu/src/renderer/widget/text.rs
+++ b/wgpu/src/renderer/widget/text.rs
@@ -22,7 +22,7 @@ impl text::Renderer for Renderer {
         };
 
         let (width, height) = if let Some(bounds) =
-            self.glyph_brush.borrow_mut().glyph_bounds(&section)
+            self.text_measurements.borrow_mut().glyph_bounds(&section)
         {
             (bounds.width().ceil(), bounds.height().ceil())
         } else {
diff --git a/wgpu/src/renderer/widget/text_input.rs b/wgpu/src/renderer/widget/text_input.rs
index b5f6c5f6..75eb20f7 100644
--- a/wgpu/src/renderer/widget/text_input.rs
+++ b/wgpu/src/renderer/widget/text_input.rs
@@ -78,7 +78,7 @@ impl text_input::Renderer for Renderer {
                 .to_string();
 
             let mut text_value_width = self
-                .glyph_brush
+                .text_measurements
                 .borrow_mut()
                 .glyph_bounds(Section {
                     text: text_before_cursor,
@@ -94,7 +94,7 @@ impl text_input::Renderer for Renderer {
 
             if spaces_at_the_end > 0 {
                 let space_width = {
-                    let glyph_brush = self.glyph_brush.borrow();
+                    let glyph_brush = self.text_measurements.borrow();
 
                     // TODO: Select appropriate font
                     let font = &glyph_brush.fonts()[0];
-- 
cgit