Always show the viewport drag button on touch devices to keep the GUI from

"jumping around". Enable/disable the button instead of show/hide on these
devices.

diff --git a/include/base.css b/include/base.css
index 90c17e476a8f202cfa62839549d1ce5f67db13a9..888b5f27a5c2e28d2e5f5f4af71fe8f2848cd5e3 100644 (file)
--- a/include/base.css
+++ b/include/base.css
@@ -320,6 +320,10 @@ html {
  /*box-shadow:inset 0.4px 0.4px 0.4px #000000;*/
 }
 
+.noVNC_status_button:disabled {
+  opacity: 0.4;
+}
+
 
 /*Settings Bubble*/
 .triangle-right {

diff --git a/include/ui.js b/include/ui.js
index 3e7db6368047cd40c60fb32039da66deeaf87ee4..ba04a8592c56b9332af77a3cae1c04c59b07a678 100644 (file)
--- a/include/ui.js
+++ b/include/ui.js
@@ -697,6 +697,7 @@ var UI;
             // State change disables viewport dragging.
             // It is enabled (toggled) by direct click on the button
             UI.setViewDrag(false);
+            UI.updateViewDragButton();
 
             switch (UI.rfb_state) {
                 case 'fatal':
@@ -889,8 +890,6 @@ var UI;
         setViewDrag: function(drag) {
             if (!UI.rfb) return;
 
-            UI.updateViewDragButton();
-
             if (typeof(drag) === "undefined" ||
                 typeof(drag) === "object") {
                 // If not specified, then toggle
@@ -911,8 +910,18 @@ var UI;
             if (UI.rfb_state === 'normal' &&
                 UI.rfb.get_display().get_viewport() &&
                 UI.rfb.get_display().clippingDisplay()) {
+                // Enable the viewport drag button
                 vmb.style.display = "inline";
+                vmb.disabled = false;
+
+            } else if (UI.rfb_state === 'normal' &&
+                       UI.isTouchDevice) {
+                // Disable the viewport drag button
+                vmb.style.display = "inline";
+                vmb.disabled = true;
+
             } else {
+                // Hide the viewport drag button
                 vmb.style.display = "none";
             }
         },