From db84851e27ff062d3d34046a4c144911665d9e3a Mon Sep 17 00:00:00 2001 From: fkaelberer Date: Fri, 28 Mar 2014 08:58:18 +0100 Subject: [PATCH] Use full screen width in presentation mode --- web/presentation_mode.js | 4 +--- web/viewer.css | 4 ++++ web/viewer.js | 6 ++++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/web/presentation_mode.js b/web/presentation_mode.js index d7c5d2945..46a4fc2de 100644 --- a/web/presentation_mode.js +++ b/web/presentation_mode.js @@ -149,11 +149,9 @@ var PresentationMode = { // Presentation Mode, by waiting until fullscreen mode is disabled. // Note: This is only necessary in non-Mozilla browsers. setTimeout(function exitPresentationModeTimeout() { + this.active = false; PDFView.setScale(this.args.previousScale); PDFView.page = page; - // Keep Presentation Mode active until the page is scrolled into view, - // to prevent issues in non-Mozilla browsers. - this.active = false; this.args = null; }.bind(this), 0); diff --git a/web/viewer.css b/web/viewer.css index aca837596..340a354b8 100644 --- a/web/viewer.css +++ b/web/viewer.css @@ -90,18 +90,22 @@ select { :-webkit-full-screen .page { margin-bottom: 100%; + border: 0; } :-moz-full-screen .page { margin-bottom: 100%; + border: 0; } :-ms-fullscreen .page { margin-bottom: 100% !important; + border: 0; } :fullscreen .page { margin-bottom: 100%; + border: 0; } :-webkit-full-screen a:not(.internalLink) { diff --git a/web/viewer.js b/web/viewer.js index 3e127c4c5..d6c525062 100644 --- a/web/viewer.js +++ b/web/viewer.js @@ -283,9 +283,11 @@ var PDFView = { if (!currentPage) { return; } - var pageWidthScale = (this.container.clientWidth - SCROLLBAR_PADDING) / + var hPadding = PresentationMode.active ? 0 : SCROLLBAR_PADDING; + var vPadding = PresentationMode.active ? 0 : VERTICAL_PADDING; + var pageWidthScale = (this.container.clientWidth - hPadding) / currentPage.width * currentPage.scale; - var pageHeightScale = (this.container.clientHeight - VERTICAL_PADDING) / + var pageHeightScale = (this.container.clientHeight - vPadding) / currentPage.height * currentPage.scale; switch (value) { case 'page-actual':