From 648c83984c31c5e479efbddbc38f4b1d384bbf1d Mon Sep 17 00:00:00 2001
From: Pierre Ossman <ossman@cendio.se>
Date: Fri, 3 Feb 2017 13:17:43 +0100
Subject: [PATCH] Scroll correct element

The element we want scrolling around is noVNC_screen, not the entire
window. This also allows us to compute the screen size without
fiddling the scrollbars on and off.
---
 app/styles/base.css |  1 +
 app/ui.js           | 16 +---------------
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/app/styles/base.css b/app/styles/base.css
index 323b6d3..0518acc 100644
--- a/app/styles/base.css
+++ b/app/styles/base.css
@@ -798,6 +798,7 @@ input[type=button]:active, select:active {
   display: flex;
   width: 100%;
   height: 100%;
+  overflow: auto;
   background-color: rgb(40, 40, 40);
 }
 :root:not(.noVNC_connected) #noVNC_screen {
diff --git a/app/ui.js b/app/ui.js
index d51d919..4726355 100644
--- a/app/ui.js
+++ b/app/ui.js
@@ -1259,21 +1259,7 @@ var UI;
         // Gets the the size of the available viewport in the browser window
         screenSize: function() {
             var screen = document.getElementById('noVNC_screen');
-
-            // Hide the scrollbars until the size is calculated
-            screen.style.overflow = "hidden";
-
-            var pos = Util.getPosition(screen);
-            var w = pos.width;
-            var h = pos.height;
-
-            screen.style.overflow = "visible";
-
-            if (isNaN(w) || isNaN(h)) {
-                return false;
-            } else {
-                return {w: w, h: h};
-            }
+            return {w: screen.offsetWidth, h: screen.offsetHeight};
         },
 
         // Normally we only apply the current resize mode after a window resize
-- 
GitLab