me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use min_bounds for cached text

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2023-08-30 05:06:08 +02:00
parent ed3454301e
commit 89acf0217e
No known key found for this signature in database
GPG key ID: 140CC052C94F138E
3 changed files with 27 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

17
wgpu/src/text.rs
View file

@ -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,