3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-06-02 06:41:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

🐛 Fix new render zoom (#6488)

Browse source 
* 🐛 Fix new render zoom

* 🐛 Use scale instead of just zoom in get_tiles_for_viewbox

---------

Co-authored-by: Belén Albeza <belen@hey.com>
This commit is contained in:
Alejandro Alonso 2025-05-16 10:49:03 +02:00 • committed by GitHub
parent ad87e9842d
commit 0cb6e0dee2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -98,10 +98,13 @@ pub(crate) struct RenderState {
pub pending_tiles: Vec<tiles::TileWithDistance>, pub pending_tiles: Vec<tiles::TileWithDistance>,
} }
pub fn get_cache_size(viewbox: Viewbox, dpr: f32) -> skia::ISize { pub fn get_cache_size(viewbox: Viewbox, scale: f32) -> skia::ISize {
// First we retrieve the extended area of the viewport that we could render. // First we retrieve the extended area of the viewport that we could render.
let (isx, isy, iex, iey) = let (isx, isy, iex, iey) = tiles::get_tiles_for_viewbox_with_interest(
tiles::get_tiles_for_viewbox_with_interest(viewbox, VIEWPORT_INTEREST_AREA_THRESHOLD, dpr); viewbox,
VIEWPORT_INTEREST_AREA_THRESHOLD,
scale,
);
let dx = if isx.signum() != iex.signum() { 1 } else { 0 }; let dx = if isx.signum() != iex.signum() { 1 } else { 0 };
let dy = if isy.signum() != iey.signum() { 1 } else { 0 }; let dy = if isy.signum() != iey.signum() { 1 } else { 0 };
@ -453,6 +456,7 @@ impl RenderState {
} }
fn render_from_cache(&mut self) { fn render_from_cache(&mut self) {
let scale = self.get_scale();
if let Some(snapshot) = &self.cached_target_snapshot { if let Some(snapshot) = &self.cached_target_snapshot {
let canvas = self.surfaces.canvas(SurfaceId::Target); let canvas = self.surfaces.canvas(SurfaceId::Target);
canvas.save(); canvas.save();
@ -468,7 +472,7 @@ impl RenderState {
let (start_tile_x, start_tile_y, _, _) = tiles::get_tiles_for_viewbox_with_interest( let (start_tile_x, start_tile_y, _, _) = tiles::get_tiles_for_viewbox_with_interest(
self.cached_viewbox, self.cached_viewbox,
VIEWPORT_INTEREST_AREA_THRESHOLD, VIEWPORT_INTEREST_AREA_THRESHOLD,
self.options.dpr(), scale,
); );
let offset_x = self.viewbox.area.left * self.cached_viewbox.zoom; let offset_x = self.viewbox.area.left * self.cached_viewbox.zoom;
let offset_y = self.viewbox.area.top * self.cached_viewbox.zoom; let offset_y = self.viewbox.area.top * self.cached_viewbox.zoom;
@ -521,11 +525,11 @@ impl RenderState {
let (isx, isy, iex, iey) = tiles::get_tiles_for_viewbox_with_interest( let (isx, isy, iex, iey) = tiles::get_tiles_for_viewbox_with_interest(
self.viewbox, self.viewbox,
VIEWPORT_INTEREST_AREA_THRESHOLD, VIEWPORT_INTEREST_AREA_THRESHOLD,
self.options.dpr(), scale,
); );
let viewbox_cache_size = get_cache_size(self.viewbox, self.options.dpr()); let viewbox_cache_size = get_cache_size(self.viewbox, scale);
let cached_viewbox_cache_size = get_cache_size(self.cached_viewbox, self.options.dpr()); let cached_viewbox_cache_size = get_cache_size(self.cached_viewbox, scale);
if viewbox_cache_size != cached_viewbox_cache_size { if viewbox_cache_size != cached_viewbox_cache_size {
self.surfaces.resize_cache( self.surfaces.resize_cache(
&mut self.gpu_state, &mut self.gpu_state,

4
render-wasm/src/render/tiles.rs
View file

@ -36,9 +36,9 @@ pub fn get_tiles_for_viewbox(viewbox: Viewbox, scale: f32) -> (i32, i32, i32, i3
pub fn get_tiles_for_viewbox_with_interest( pub fn get_tiles_for_viewbox_with_interest(
viewbox: Viewbox, viewbox: Viewbox,
interest: i32, interest: i32,
dpr: f32, scale: f32,
) -> (i32, i32, i32, i32) { ) -> (i32, i32, i32, i32) {
let (sx, sy, ex, ey) = get_tiles_for_viewbox(viewbox, dpr); let (sx, sy, ex, ey) = get_tiles_for_viewbox(viewbox, scale);
(sx - interest, sy - interest, ex + interest, ey + interest) (sx - interest, sy - interest, ex + interest, ey + interest)
} }