1 files changed, 35 insertions, 26 deletions

diff --git a/beamer/viewer/screen/screen.js b/beamer/viewer/screen/screen.js
index c65ebc3..4bebab4 100644
--- a/beamer/viewer/screen/screen.js
+++ b/beamer/viewer/screen/screen.js
@@ -1,19 +1,7 @@
 /*
  * Beamer Viewer, a web-based PDF presentation viewer
- * Copyright (C) 2018 Pacien TRAN-GIRARD
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- * 
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * Copyright 2018-2024 Pacien TRAN-GIRARD
+ * SPDX-License-Identifier: EUPL-1.2
  */
 
 "use strict";
@@ -42,10 +30,7 @@ class Screen {
   }
 
   _registerListeners() {
-    const self = this;
-    this.window.addEventListener("resize", function() {
-      self._repaint();
-    });
+    this.window.addEventListener("resize", () => this._repaint());
   }
 
   _hideWelcomeScreen() {
@@ -62,9 +47,32 @@ class Screen {
     };
   }
 
+  _getScreenOffsets(secondary, width, height) {
+    if (!secondary) return { xOffset: 0, yOffset: 0 };
+
+    const viewport = this.page.getViewport(1);
+    if (viewport.width > viewport.height)
+      return { xOffset: -width, yOffset: 0 };
+    else
+      return { xOffset: 0, yOffset: -height };
+  }
+
   _getSlideSizeRatio() {
     const viewport = this.page.getViewport(1);
-    return (viewport.width / 2) / viewport.height;
+
+    if (viewport.width > viewport.height)
+      return (viewport.width / 2) / viewport.height;
+    else
+      return viewport.width / (viewport.height / 2);
+  }
+
+  _getScaleFactor(width, height) {
+    const viewport = this.page.getViewport(1);
+
+    if (viewport.width > viewport.height)
+      return height / viewport.height;
+    else
+      return width / viewport.width;
   }
 
   _newCanvas(width, height, xOffset, yOffset) {
@@ -91,10 +99,9 @@ class Screen {
       viewport: this.page.getViewport(scaleFactor)
     };
 
-    const self = this;
-    this.page.render(renderContext).then(function() {
-      self._showCanvas(canvas);
-    });
+    this.page
+      .render(renderContext)
+      .then(() => this._showCanvas(canvas));
   }
 
   _repaint() {
@@ -102,9 +109,11 @@ class Screen {
 
     const screenRatio = this._getSlideSizeRatio();
     const { width, height } = this._getScreenSize(screenRatio);
-    const scaleFactor = height / this.page.getViewport(1).height;
-    const xOffset = this.secondary ? -width : 0;
-    const { canvas, context } = this._newCanvas(width, height, xOffset, 0);
+    const scaleFactor = this._getScaleFactor(width, height);
+    const { xOffset, yOffset } =
+      this._getScreenOffsets(this.secondary, width, height);
+    const { canvas, context } =
+      this._newCanvas(width, height, xOffset, yOffset);
     this._render(canvas, context, scaleFactor);
   }
 }