From c0a11d00fd1c2fed0d1e2c48e2143bbb2d66aa2c Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Mon, 27 Sep 2021 14:35:31 +0200 Subject: [PATCH] wait #4707 @1 --- js/libs/fluidbook/fluidbook.loader.js | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/js/libs/fluidbook/fluidbook.loader.js b/js/libs/fluidbook/fluidbook.loader.js index 148e90db..5729477e 100644 --- a/js/libs/fluidbook/fluidbook.loader.js +++ b/js/libs/fluidbook/fluidbook.loader.js @@ -691,20 +691,27 @@ FluidbookLoader.prototype = { } var $this = this; - var z = this.fluidbook.resize.bookScale * 1.15; - var mz = this.fluidbook.resize.bookScale * this.fluidbook.zoom.max; + var upscale = this.fluidbook.settings.svgToCanvasUpscale !== undefined ? this.fluidbook.settings.svgToCanvasUpscale : 1; + + var z = this.fluidbook.resize.bookScale * upscale; + var mz = this.fluidbook.resize.bookScale * this.fluidbook.zoom.max * upscale; - var w = this.fluidbook.settings.width * z; - var h = this.fluidbook.settings.height * z; - var wz = this.fluidbook.settings.width * mz; - var hz = this.fluidbook.settings.height * mz; $('canvas[data-page]').each(function () { if ($this.fluidbook.zoom.zoom === 1 && $(this).hasClass('z')) { return; } - var canvas = $(this).get(0); + var page = $(this).data('page'); + var dim=$this.getPageDimensions(page); + + var w = dim.width* z; + var h = dim.height * z; + var wz = dim.width * mz; + var hz = dim.height * mz; + + var canvas = $(this).get(0); + if ($(this).data('bookScale') === z) { return; -- 2.39.5