From 4b1c7b1e269b98eaf4906c82cb3fd09566dce7be Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sat, 14 Nov 2020 18:12:06 -0500
Subject: Display layout updates (#1032)

* Fix display scroll not always using the right position

* Update display layout and scroll method

* Fix border size
---
 ext/mixed/js/scroll.js | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

(limited to 'ext/mixed/js/scroll.js')

diff --git a/ext/mixed/js/scroll.js b/ext/mixed/js/scroll.js
index 1cad87ef..a57bedf4 100644
--- a/ext/mixed/js/scroll.js
+++ b/ext/mixed/js/scroll.js
@@ -16,7 +16,8 @@
  */
 
 class WindowScroll {
-    constructor() {
+    constructor(node) {
+        this._node = node;
         this._animationRequestId = null;
         this._animationStartTime = 0;
         this._animationStartX = 0;
@@ -28,11 +29,11 @@ class WindowScroll {
     }
 
     get x() {
-        return window.scrollX || window.pageXOffset;
+        return this._node !== null ? this._node.scrollLeft : window.scrollX || window.pageXOffset;
     }
 
     get y() {
-        return window.scrollY || window.pageYOffset;
+        return this._node !== null ? this._node.scrollTop : window.scrollY || window.pageYOffset;
     }
 
     toY(y) {
@@ -45,7 +46,7 @@ class WindowScroll {
 
     to(x, y) {
         this.stop();
-        window.scroll(x, y);
+        this._scroll(x, y);
     }
 
     animate(x, y, time) {
@@ -71,13 +72,13 @@ class WindowScroll {
 
     _onAnimationFrame(time) {
         if (time >= this._animationEndTime) {
-            window.scroll(this._animationEndX, this._animationEndY);
+            this._scroll(this._animationEndX, this._animationEndY);
             this._animationRequestId = null;
             return;
         }
 
         const t = this._easeInOutCubic((time - this._animationStartTime) / (this._animationEndTime - this._animationStartTime));
-        window.scroll(
+        this._scroll(
             this._lerp(this._animationStartX, this._animationEndX, t),
             this._lerp(this._animationStartY, this._animationEndY, t)
         );
@@ -97,4 +98,13 @@ class WindowScroll {
     _lerp(start, end, percent) {
         return (end - start) * percent + start;
     }
+
+    _scroll(x, y) {
+        if (this._node !== null) {
+            this._node.scrollLeft = x;
+            this._node.scrollTop = y;
+        } else {
+            window.scroll(x, y);
+        }
+    }
 }
-- 
cgit v1.2.3