hardcoresushi
/
libpdfviewer
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

rename lazy to zoom and check it for scrollTo

This commit is contained in:
Daniel Micay 2020-04-04 11:31:16 -04:00
parent db025d7851
commit e98398749e
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/src/main/assets/viewer.js
View File

@ -4,7 +4,7 @@ const padding = document.getElementById("padding");
let pdfDoc = null;
let pageRendering = false;
let renderPending = false;
let renderPendingLazy = false;
let renderPendingZoom = false;
const canvas = document.getElementById('content');
let orientationDegrees = 0;
let zoomRatio = 1;
@ -22,7 +22,7 @@ function maybeRenderNextPage() {
if (renderPending) {
pageRendering = false;
renderPending = false;
renderPage(channel.getPage(), renderPendingLazy, false);
renderPage(channel.getPage(), renderPendingZoom, false);
return true;
}
return false;
@ -49,17 +49,19 @@ function doPrerender(pageNumber, prerenderTrigger) {
}
}
function display(newCanvas) {
function display(newCanvas, zoom) {
canvas.height = newCanvas.height;
canvas.width = newCanvas.width;
canvas.style.height = newCanvas.style.height;
canvas.style.width = newCanvas.style.width;
padding.style.width = canvas.style.width;
canvas.getContext("2d", { alpha: false }).drawImage(newCanvas, 0, 0);
scrollTo(0, 0);
if (!zoom) {
scrollTo(0, 0);
}
}
function renderPage(pageNumber, lazy, prerender, prerenderTrigger=0) {
function renderPage(pageNumber, zoom, prerender, prerenderTrigger=0) {
pageRendering = true;
useRender = !prerender;
@ -76,7 +78,7 @@ function renderPage(pageNumber, lazy, prerender, prerenderTrigger=0) {
cache.splice(i, 1);
cache.push(cached);
display(cached.canvas);
display(cached.canvas, zoom);
textLayerDiv.replaceWith(cached.textLayerDiv);
textLayerDiv = cached.textLayerDiv;
@ -124,7 +126,7 @@ function renderPage(pageNumber, lazy, prerender, prerenderTrigger=0) {
if (!useRender || rendered) {
return;
}
display(newCanvas);
display(newCanvas, zoom);
rendered = true;
}
render();
@ -167,7 +169,7 @@ function renderPage(pageNumber, lazy, prerender, prerenderTrigger=0) {
});
}
function onRenderPage(lazy) {
function onRenderPage(zoom) {
if (pageRendering) {
if (newPageNumber === channel.getPage() && getZoomRatio === channel.getZoomRatio() &&
orientationDegrees === channel.getDocumentOrientationDegrees()) {
@ -176,13 +178,13 @@ function onRenderPage(lazy) {
}
renderPending = true;
renderPendingLazy = lazy;
renderPendingZoom = zoom;
if (task !== null) {
task.cancel();
task = null;
}
} else {
renderPage(channel.getPage(), lazy, false);
renderPage(channel.getPage(), zoom, false);
}
}

4
app/src/main/java/org/grapheneos/pdfviewer/PdfViewer.java
View File

@ -329,8 +329,8 @@ public class PdfViewer extends AppCompatActivity implements LoaderManager.Loader
mWebView.loadUrl("https://localhost/viewer.html");
}
private void renderPage(final boolean lazy) {
mWebView.evaluateJavascript(lazy ? "onRenderPage(true)" : "onRenderPage(false)", null);
private void renderPage(final boolean zoom) {
mWebView.evaluateJavascript(zoom ? "onRenderPage(true)" : "onRenderPage(false)", null);
}
private void documentOrientationChanged(final int orientationDegreesOffset) {