Merge pull request #16026 from calixteman/ptz_mac

Fix pinch-to-zoom on mac for the Firefox builtin viewer
This commit is contained in:
calixteman 2023-02-08 15:16:59 +01:00 committed by GitHub
commit 9cea76483a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 1 deletions

View File

@ -32,6 +32,7 @@ import {
CMapCompressionType,
createPromiseCapability,
createValidAbsoluteUrl,
FeatureTest,
InvalidPDFException,
MissingPDFException,
OPS,
@ -89,6 +90,7 @@ export {
CMapCompressionType,
createPromiseCapability,
createValidAbsoluteUrl,
FeatureTest,
getDocument,
getFilenameFromUrl,
getPdfFilenameFromUrl,

View File

@ -38,6 +38,7 @@ import {
AnnotationEditorType,
build,
createPromiseCapability,
FeatureTest,
getDocument,
getFilenameFromUrl,
getPdfFilenameFromUrl,
@ -2695,12 +2696,16 @@ function webViewerWheel(evt) {
// https://searchfox.org/mozilla-central/rev/d62c4c4d5547064487006a1506287da394b64724/widget/InputData.cpp#618-626
let scaleFactor = Math.exp(-evt.deltaY / 100);
const isBuiltInMac =
typeof PDFJSDev !== "undefined" &&
PDFJSDev.test("MOZCENTRAL") &&
FeatureTest.platform.isMac;
const isPinchToZoom =
evt.ctrlKey &&
!PDFViewerApplication._isCtrlKeyDown &&
deltaMode === WheelEvent.DOM_DELTA_PIXEL &&
evt.deltaX === 0 &&
Math.abs(scaleFactor - 1) < 0.05 &&
(Math.abs(scaleFactor - 1) < 0.05 || isBuiltInMac) &&
evt.deltaZ === 0;
if (