3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-07-13 18:57:19 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #6526 from penpot/superalex-improve-zoom-performance-and-behaviour

Browse source 
🐛 Fix zoom performance and behaviour
This commit is contained in:
Aitor Moreno 2025-05-22 12:15:38 +02:00 • committed by GitHub
commit d54a7d0401
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 60 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

33
render-wasm/src/main.rs
View file

@ -91,9 +91,19 @@ pub extern "C" fn set_canvas_background(raw_color: u32) {
}
#[no_mangle]
pub extern "C" fn render(timestamp: i32) {
pub extern "C" fn render(_: i32) {
with_state!(state, {
state.start_render_loop(timestamp).expect("Error rendering");
state
.start_render_loop(performance::get_time())
.expect("Error rendering");
});
}
#[no_mangle]
pub extern "C" fn render_from_cache(_: i32) {
with_state!(state, {
let render_state = state.render_state();
render_state.render_from_cache();
});
}
@ -137,17 +147,16 @@ pub extern "C" fn resize_viewbox(width: i32, height: i32) {
pub extern "C" fn set_view(zoom: f32, x: f32, y: f32) {
with_state!(state, {
let render_state = state.render_state();
let zoom_changed = zoom != render_state.viewbox.zoom;
render_state.viewbox.set_all(zoom, x, y);
if zoom_changed {
with_state!(state, {
if state.render_state.options.is_profile_rebuild_tiles() {
state.rebuild_tiles();
} else {
state.rebuild_tiles_shallow();
}
});
}
with_state!(state, {
// We can have renders in progress
state.render_state.cancel_animation_frame();
if state.render_state.options.is_profile_rebuild_tiles() {
state.rebuild_tiles();
} else {
state.rebuild_tiles_shallow();
}
});
});
}

32
render-wasm/src/render.rs
View file

@ -494,8 +494,16 @@ impl RenderState {
.update_render_context(self.render_area, self.get_scale());
}
fn render_from_cache(&mut self) {
let scale = self.get_scale();
pub fn cancel_animation_frame(&mut self) {
if self.render_in_progress {
if let Some(frame_id) = self.render_request_id {
wapi::cancel_animation_frame!(frame_id);
}
}
}
pub fn render_from_cache(&mut self) {
let scale = self.get_cached_scale();
if let Some(snapshot) = &self.cached_target_snapshot {
let canvas = self.surfaces.canvas(SurfaceId::Target);
canvas.save();
@ -525,6 +533,7 @@ impl RenderState {
canvas.clear(self.background_color);
canvas.draw_image(snapshot, (0, 0), Some(&skia::Paint::default()));
canvas.restore();
self.flush_and_submit();
}
}
@ -535,19 +544,12 @@ impl RenderState {
structure: &HashMap<Uuid, Vec<StructureEntry>>,
timestamp: i32,
) -> Result<(), String> {
if self.render_in_progress {
if let Some(frame_id) = self.render_request_id {
wapi::cancel_animation_frame!(frame_id);
}
}
let scale = self.get_scale();
self.tile_viewbox.update(self.viewbox, scale);
performance::begin_measure!("render");
performance::begin_measure!("start_render_loop");
// If we have cached data let's do a fast render from it
self.render_from_cache();
let scale = self.get_scale();
self.reset_canvas();
self.surfaces.apply_mut(
&[
@ -601,9 +603,7 @@ impl RenderState {
self.flush_and_submit();
if self.render_in_progress {
if let Some(frame_id) = self.render_request_id {
wapi::cancel_animation_frame!(frame_id);
}
self.cancel_animation_frame();
self.render_request_id = Some(wapi::request_animation_frame!());
} else {
performance::end_measure!("render");
@ -1041,4 +1041,8 @@ impl RenderState {
pub fn get_scale(&self) -> f32 {
self.viewbox.zoom() * self.options.dpr()
}
pub fn get_cached_scale(&self) -> f32 {
self.cached_viewbox.zoom() * self.options.dpr()
}
}