From 89acf0217e0acd92a82bff1fd516cd4266c0878a Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Wed, 30 Aug 2023 05:06:08 +0200
Subject: Use `min_bounds` for cached text

---
 wgpu/src/text.rs | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

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

diff --git a/wgpu/src/text.rs b/wgpu/src/text.rs
index da2062fe..ee352368 100644
--- a/wgpu/src/text.rs
+++ b/wgpu/src/text.rs
@@ -59,7 +59,7 @@ impl Pipeline {
         device: &wgpu::Device,
         queue: &wgpu::Queue,
         sections: &[Text<'_>],
-        bounds: Rectangle,
+        layer_bounds: Rectangle,
         scale_factor: f32,
         target_size: Size<u32>,
     ) {
@@ -98,8 +98,8 @@ impl Pipeline {
                             ),
                             font: text.font,
                             bounds: Size {
-                                width: bounds.width,
-                                height: bounds.height,
+                                width: text.bounds.width,
+                                height: text.bounds.height,
                             },
                             shaping: text.shaping,
                         },
@@ -110,7 +110,7 @@ impl Pipeline {
             })
             .collect();
 
-        let layer_bounds = bounds * scale_factor;
+        let layer_bounds = layer_bounds * scale_factor;
 
         let text_areas = sections.iter().zip(allocations.iter()).filter_map(
             |(section, allocation)| {
@@ -144,11 +144,14 @@ impl Pipeline {
                             return None;
                         };
 
-                        let buffer = cache.get(key).expect("Get cached buffer");
+                        let entry = cache.get(key).expect("Get cached buffer");
 
                         (
-                            buffer,
-                            text.bounds,
+                            &entry.buffer,
+                            Rectangle::new(
+                                text.bounds.position(),
+                                entry.min_bounds,
+                            ),
                             text.horizontal_alignment,
                             text.vertical_alignment,
                             text.color,
-- 
cgit