github/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2026-09-10 05:58:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

🐛 Fix(render-wasm): stabilize interactive drag backbuffer crops

Browse Source
This commit is contained in:
Alejandro Alonso 2026-05-07 17:12:00 +02:00 committed by GitHub
parent bc0f081371
commit fc7748fc84
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
render-wasm/src/main.rs
View File

@ -457,7 +457,6 @@ pub extern "C" fn set_view_end() -> Result<()> {
// instead of re-drawing every visible tile from scratch. // instead of re-drawing every visible tile from scratch.
state.render_state.rebuild_tile_index(&state.shapes); state.render_state.rebuild_tile_index(&state.shapes);
} }
performance::end_measure!("set_view_end"); performance::end_measure!("set_view_end");
}); });
Ok(()) Ok(())

38
render-wasm/src/render.rs
View File

@ -394,6 +394,12 @@ pub struct InteractiveDragCrop {
/// True if the captured crop bounds were fully inside the viewport at capture time. /// True if the captured crop bounds were fully inside the viewport at capture time.
/// Used to avoid serving partial/offscreen crops during interactive drag. /// Used to avoid serving partial/offscreen crops during interactive drag.
pub fits_viewport_at_capture: bool, pub fits_viewport_at_capture: bool,
/// Viewbox origin (doc-space) at capture time.
pub capture_vb_left: f32,
pub capture_vb_top: f32,
/// Backbuffer pixel origin used for `snapshot_rect` (so we can do 1:1 blits).
pub capture_src_left: i32,
pub capture_src_top: i32,
pub image: skia::Image, pub image: skia::Image,
} }
@ -1728,6 +1734,10 @@ impl RenderState {
src_doc_bounds, src_doc_bounds,
src_selrect: selrect, src_selrect: selrect,
fits_viewport_at_capture, fits_viewport_at_capture,
capture_vb_left: vb_left,
capture_vb_top: vb_top,
capture_src_left: src_irect.left,
capture_src_top: src_irect.top,
image, image,
}, },
); );
@ -3012,7 +3022,6 @@ impl RenderState {
if let Some(crop) = self.backbuffer_crop_cache.get(&node_id) { if let Some(crop) = self.backbuffer_crop_cache.get(&node_id) {
let crop_image = &crop.image; let crop_image = &crop.image;
let crop_src_selrect = crop.src_selrect; let crop_src_selrect = crop.src_selrect;
let crop_src_doc_bounds = crop.src_doc_bounds;
let cur_selrect = tree.get(&node_id).map(|s| s.selrect()); let cur_selrect = tree.get(&node_id).map(|s| s.selrect());
let (dx, dy) = match cur_selrect { let (dx, dy) = match cur_selrect {
@ -3022,23 +3031,10 @@ impl RenderState {
), ),
None => (0.0, 0.0), None => (0.0, 0.0),
}; };
let dst_doc_rect = Rect::new(
crop_src_doc_bounds.left + dx,
crop_src_doc_bounds.top + dy,
crop_src_doc_bounds.right + dx,
crop_src_doc_bounds.bottom + dy,
);
let scale = self.get_scale(); let scale = self.get_scale();
let translation = self let translation = self
.surfaces .surfaces
.get_render_context_translation(self.render_area, scale); .get_render_context_translation(self.render_area, scale);
let dst_tile_rect = skia::Rect::from_xywh(
(dst_doc_rect.left + translation.0) * scale,
(dst_doc_rect.top + translation.1) * scale,
dst_doc_rect.width() * scale,
dst_doc_rect.height() * scale,
);
let canvas = self.surfaces.canvas(target_surface); let canvas = self.surfaces.canvas(target_surface);
canvas.save(); canvas.save();
@ -3058,12 +3054,14 @@ impl RenderState {
canvas.clip_path(&clip_path, skia::ClipOp::Intersect, true); canvas.clip_path(&clip_path, skia::ClipOp::Intersect, true);
} }
} }
canvas.draw_image_rect( let doc_left =
crop_image, crop.capture_vb_left + (crop.capture_src_left as f32 / scale) + dx;
None, let doc_top =
dst_tile_rect, crop.capture_vb_top + (crop.capture_src_top as f32 / scale) + dy;
&skia::Paint::default(),
); let x = (doc_left + translation.0) * scale;
let y = (doc_top + translation.1) * scale;
canvas.draw_image(crop_image, (x, y), Some(&skia::Paint::default()));
canvas.restore(); canvas.restore();
} }