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

Include images and saved meshes when pasting Frame

Browse source 
`tiny_skia::Frame` was ignoring images in `Frame::paste`, making images
not show up when created in a `with_clip` context.

`wgpu::Frame` similarly did not pass through meshes in its paste method,
that may have been saved from a nested `with_clip` call.
This commit is contained in:
Gabriel Vogel 2024-09-24 22:29:03 +02:00
parent 142aba2f17
commit 26b09e1b4d
2 changed files with 2 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
tiny_skia/src/geometry.rs
View file

@ -256,6 +256,7 @@ impl geometry::frame::Backend for Frame {
fn paste(&mut self, frame: Self) { fn paste(&mut self, frame: Self) {
self.primitives.extend(frame.primitives); self.primitives.extend(frame.primitives);
self.text.extend(frame.text); self.text.extend(frame.text);
self.images.extend(frame.images);
} }
fn translate(&mut self, translation: Vector) { fn translate(&mut self, translation: Vector) {

1
wgpu/src/geometry.rs
View file

@ -395,6 +395,7 @@ impl geometry::frame::Backend for Frame {
} }
fn paste(&mut self, frame: Frame) { fn paste(&mut self, frame: Frame) {
self.meshes.extend(frame.meshes);
self.meshes self.meshes
.extend(frame.buffers.into_meshes(frame.clip_bounds)); .extend(frame.buffers.into_meshes(frame.clip_bounds));