jcarr
/
noVNC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
samhed 2015-06-16 22:39:17 +02:00
parent 539955ff27
commit 29a0e6a8a3
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/base.css
View File

@ -320,6 +320,10 @@ html {
/*box-shadow:inset 0.4px 0.4px 0.4px #000000;*/ /*box-shadow:inset 0.4px 0.4px 0.4px #000000;*/
} }
.noVNC_status_button:disabled {
opacity: 0.4;
}
/*Settings Bubble*/ /*Settings Bubble*/
.triangle-right { .triangle-right {

13
include/ui.js
View File

@ -697,6 +697,7 @@ var UI;
// State change disables viewport dragging. // State change disables viewport dragging.
// It is enabled (toggled) by direct click on the button // It is enabled (toggled) by direct click on the button
UI.setViewDrag(false); UI.setViewDrag(false);
UI.updateViewDragButton();
switch (UI.rfb_state) { switch (UI.rfb_state) {
case 'fatal': case 'fatal':
@ -889,8 +890,6 @@ var UI;
setViewDrag: function(drag) { setViewDrag: function(drag) {
if (!UI.rfb) return; if (!UI.rfb) return;
UI.updateViewDragButton();
if (typeof(drag) === "undefined" || if (typeof(drag) === "undefined" ||
typeof(drag) === "object") { typeof(drag) === "object") {
// If not specified, then toggle // If not specified, then toggle
@ -911,8 +910,18 @@ var UI;
if (UI.rfb_state === 'normal' && if (UI.rfb_state === 'normal' &&
UI.rfb.get_display().get_viewport() && UI.rfb.get_display().get_viewport() &&
UI.rfb.get_display().clippingDisplay()) { UI.rfb.get_display().clippingDisplay()) {
// Enable the viewport drag button
vmb.style.display = "inline"; 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 { } else {
// Hide the viewport drag button
vmb.style.display = "none"; vmb.style.display = "none";
} }
}, },