Replace the --viewport-scale-factor
CSS variable
This CSS variable is only used together with the `annotationCanvasMap`-functionality in the canvas-code, however its value can be *trivially* computed by using the older `--zoom-factor` CSS variable together with the `PixelsPerInch`-structure. Rather than having *two different* CSS variables that are this closely linked, it seems better to simplify things by using just one CSS variable instead.
This commit is contained in:
parent
143ba30bef
commit
e67cd7fae0
@ -2726,8 +2726,9 @@ class CanvasGraphics {
|
|||||||
canvasHeight
|
canvasHeight
|
||||||
);
|
);
|
||||||
const { canvas, context } = this.annotationCanvas;
|
const { canvas, context } = this.annotationCanvas;
|
||||||
canvas.style.width = `calc(${width}px * var(--viewport-scale-factor))`;
|
const viewportScaleFactorStr = `var(--zoom-factor) * ${PixelsPerInch.PDF_TO_CSS_UNITS}`;
|
||||||
canvas.style.height = `calc(${height}px * var(--viewport-scale-factor))`;
|
canvas.style.width = `calc(${width}px * ${viewportScaleFactorStr})`;
|
||||||
|
canvas.style.height = `calc(${height}px * ${viewportScaleFactorStr})`;
|
||||||
this.annotationCanvasMap.set(id, canvas);
|
this.annotationCanvasMap.set(id, canvas);
|
||||||
this.annotationCanvas.savedCtx = this.ctx;
|
this.annotationCanvas.savedCtx = this.ctx;
|
||||||
this.ctx = context;
|
this.ctx = context;
|
||||||
|
@ -1012,10 +1012,6 @@ class BaseViewer {
|
|||||||
}
|
}
|
||||||
|
|
||||||
this._doc.style.setProperty("--zoom-factor", newScale);
|
this._doc.style.setProperty("--zoom-factor", newScale);
|
||||||
this._doc.style.setProperty(
|
|
||||||
"--viewport-scale-factor",
|
|
||||||
newScale * PixelsPerInch.PDF_TO_CSS_UNITS
|
|
||||||
);
|
|
||||||
|
|
||||||
const updateArgs = { scale: newScale };
|
const updateArgs = { scale: newScale };
|
||||||
for (const pageView of this._pages) {
|
for (const pageView of this._pages) {
|
||||||
|
@ -329,16 +329,14 @@ class PDFPageView {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const totalRotation = (this.rotation + this.pdfPageRotate) % 360;
|
const totalRotation = (this.rotation + this.pdfPageRotate) % 360;
|
||||||
const viewportScale = this.scale * PixelsPerInch.PDF_TO_CSS_UNITS;
|
|
||||||
this.viewport = this.viewport.clone({
|
this.viewport = this.viewport.clone({
|
||||||
scale: viewportScale,
|
scale: this.scale * PixelsPerInch.PDF_TO_CSS_UNITS,
|
||||||
rotation: totalRotation,
|
rotation: totalRotation,
|
||||||
});
|
});
|
||||||
|
|
||||||
if (this._isStandalone) {
|
if (this._isStandalone) {
|
||||||
const { style } = document.documentElement;
|
const { style } = document.documentElement;
|
||||||
style.setProperty("--zoom-factor", this.scale);
|
style.setProperty("--zoom-factor", this.scale);
|
||||||
style.setProperty("--viewport-scale-factor", viewportScale);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (this.svg) {
|
if (this.svg) {
|
||||||
|
@ -22,7 +22,6 @@
|
|||||||
--page-border: 9px solid transparent;
|
--page-border: 9px solid transparent;
|
||||||
--spreadHorizontalWrapped-margin-LR: -3.5px;
|
--spreadHorizontalWrapped-margin-LR: -3.5px;
|
||||||
--zoom-factor: 1;
|
--zoom-factor: 1;
|
||||||
--viewport-scale-factor: 1;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@media screen and (forced-colors: active) {
|
@media screen and (forced-colors: active) {
|
||||||
|
Loading…
Reference in New Issue
Block a user