From bc6ca5059bd569f8081b9fa3f3af839267de7486 Mon Sep 17 00:00:00 2001
From: Calin Crisan <ccrisan@gmail.com>
Date: Fri, 25 Dec 2015 21:36:46 +0200
Subject: [PATCH] fixed frame layout in full-screen mode

---
 motioneye/static/js/main.js | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/motioneye/static/js/main.js b/motioneye/static/js/main.js
index ee6b838..7cd3e2c 100644
--- a/motioneye/static/js/main.js
+++ b/motioneye/static/js/main.js
@@ -4224,8 +4224,6 @@ function doFullScreenCamera(cameraId) {
     $('div.header').addClass('full-screen');
     $('div.footer').addClass('full-screen');
     
-    updateLayout();
-
     /* try to make browser window full screen */
     var element = document.documentElement;
     var requestFullScreen = (
@@ -4238,9 +4236,17 @@ function doFullScreenCamera(cameraId) {
             element.msRequestFullscreen ||
             element.msRequestFullScreen);
     
+
     if (requestFullScreen) {
         requestFullScreen.call(element);
     }
+
+    /* calling updateLayout like this fixes wrong frame size
+     * after the window as actually been put into full screen mode */
+    updateLayout();
+    setTimeout(updateLayout, 200);
+    setTimeout(updateLayout, 400);
+    setTimeout(updateLayout, 1000);
 }
 
 function doExitFullScreenCamera() {
@@ -4429,17 +4435,6 @@ $(document).ready(function () {
     /* test buttons */
     $('div#uploadTestButton').click(doTestUpload);
     
-    /* prevent scroll events on settings div from propagating TODO this does not actually work */
-    $('div.settings').mousewheel(function (e, d) {
-        var t = $(this);
-        if (d > 0 && t.scrollTop() === 0) {
-            e.preventDefault();
-        }
-        else if (d < 0 && (t.scrollTop() === t.get(0).scrollHeight - t.innerHeight())) {
-            e.preventDefault();
-        }
-    });
-    
     initUI();
     beginProgress();
     
-- 
2.39.5