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

Clip text that exceeds section bounds in iced_wgpu

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2023-05-08 16:41:42 +02:00
parent c6d9221ee4
commit 9a8b30d7e9
No known key found for this signature in database
GPG key ID: 140CC052C94F138E
1 changed files with 60 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

38
wgpu/src/text.rs
View file

@ -96,21 +96,16 @@ impl Pipeline {
})
.collect();
let bounds = glyphon::TextBounds {
left: (bounds.x * scale_factor) as i32,
top: (bounds.y * scale_factor) as i32,
right: ((bounds.x + bounds.width) * scale_factor) as i32,
bottom: ((bounds.y + bounds.height) * scale_factor) as i32,
};
let bounds = bounds * scale_factor;
let text_areas =
sections.iter().zip(keys.iter()).map(|(section, key)| {
sections
.iter()
.zip(keys.iter())
.filter_map(|(section, key)| {
let buffer =
self.render_cache.get(key).expect("Get cached buffer");
let x = section.bounds.x * scale_factor;
let y = section.bounds.y * scale_factor;
let (total_lines, max_width) = buffer
.layout_runs()
.enumerate()
@ -121,6 +116,9 @@ impl Pipeline {
let total_height =
total_lines as f32 * buffer.metrics().line_height;
let x = section.bounds.x * scale_factor;
let y = section.bounds.y * scale_factor;
let left = match section.horizontal_alignment {
alignment::Horizontal::Left => x,
alignment::Horizontal::Center => x - max_width / 2.0,
@ -133,15 +131,29 @@ impl Pipeline {
alignment::Vertical::Bottom => y - total_height,
};
let section_bounds = Rectangle {
x: left,
y: top,
width: section.bounds.width * scale_factor,
height: section.bounds.height * scale_factor,
};
let clip_bounds = bounds.intersection(&section_bounds)?;
// TODO: Subpixel glyph positioning
let left = left.round() as i32;
let top = top.round() as i32;
glyphon::TextArea {
Some(glyphon::TextArea {
buffer,
left,
top,
bounds,
bounds: glyphon::TextBounds {
left: clip_bounds.x as i32,
top: clip_bounds.y as i32,
right: (clip_bounds.x + clip_bounds.width) as i32,
bottom: (clip_bounds.y + clip_bounds.height) as i32,
},
default_color: {
let [r, g, b, a] = section.color.into_linear();
@ -152,7 +164,7 @@ impl Pipeline {
(a * 255.0) as u8,
)
},
}
})
});
let result = renderer.prepare(