Merge branch 'hotfix/virt-7.0.1'

zentyal · Feb 25, 2021 · e7e4ff9 · e7e4ff9
2 parents f813b30 + 3e78858
commit e7e4ff9
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/main/virt/ChangeLog b/main/virt/ChangeLog
@@ -1,3 +1,5 @@
+7.0.1
+	+ Fix VM modal size
 7.0.0
 	+ Fix VM shutdown (just for virsh)
 	+ Fix regression on vnc service unit file

diff --git a/main/virt/debian/changelog b/main/virt/debian/changelog
@@ -1,3 +1,9 @@
+zentyal-virt (7.0.1) focal; urgency=medium
+
+  * New upstream release
+
+ -- Bruno Lorente <blorente@novadevs.com>  Mon, 22 Feb 2021 16:55:15 +0100
+
 zentyal-virt (7.0.0) focal; urgency=low
 
   * New upstream release

diff --git a/main/virt/stubs/vncviewer.html.mas b/main/virt/stubs/vncviewer.html.mas
@@ -6,12 +6,15 @@
 <script>
 function setupResizeWatcher() {
     var vnc = document.querySelector("#vnc_frame");
-    var canvas = vnc.contentDocument.querySelector("#noVNC_canvas");
-
+    var canvas = vnc.contentDocument.querySelector("canvas");
+    var config = { attributes: true, attributeFilter: ['width', 'height'] };
     function onResize() {
-        var w = canvas.width;
-        var h = canvas.height + 38;
+        var w = canvas.offsetWidth;
+        var h = canvas.offsetHeight + 38;
+        console.log(w, h);
         var dialog = document.querySelector("#load_in_dialog");
+        console.log(w, h);
+        console.log("he llegado xD...")
         if (dialog) {
             dialog.style.width = w + "px";
             dialog.style.height = h + "px";
@@ -23,6 +26,6 @@ function setupResizeWatcher() {
 
     new MutationObserver(function (mutations) {
         if (mutations.length > 0) onResize();
-    }).observe(canvas, { attributes: true, attributeFilter: ['width', 'height'] });
+    }).observe(canvas, config);
 }
 </script>