diff --git a/include/base.css b/include/base.css index b3c76a06..172b0e8d 100644 --- a/include/base.css +++ b/include/base.css @@ -66,17 +66,20 @@ html { } #noVNC_mobile_buttons { - position:fixed; - padding-left:10px; - padding-top:9px; display: none; } -#noVNC_buttons_right { +.noVNC-buttons-left { position:fixed; + padding-left:10px; + padding-top:9px; +} + +.noVNC-buttons-right { + float:right; + right: 0px; padding-right:10px; padding-top:9px; - right:0; } #noVNC_status_bar { @@ -90,7 +93,7 @@ html { width:100%; } -.VNC_status_button, #clipboardbutton, #connectbutton { +.noVNC_status_button, #clipboardbutton, #connectbutton { font-size: 14px; } @@ -112,12 +115,6 @@ html { float:right; } -.VNC_buttons_right { - text-align: right; -} -.VNC_buttons_left { - text-align: left; -} .noVNC_status_normal { background: #eee; } diff --git a/include/display.js b/include/display.js index 4f37cd14..cd228580 100644 --- a/include/display.js +++ b/include/display.js @@ -304,10 +304,10 @@ that.viewportChange = function(deltaX, deltaY, width, height) { } if ((deltaX === 0) && (deltaY === 0)) { - //message("skipping"); + //Util.Debug("skipping viewport change"); return; } - message("deltaX: " + deltaX + ", deltaY: " + deltaY); + Util.Debug("viewportChange deltaX: " + deltaX + ", deltaY: " + deltaY); v.x += deltaX; vx2 += deltaX; @@ -363,7 +363,7 @@ that.viewportChange = function(deltaX, deltaY, width, height) { c_ctx.fillRect(0, y1, v.w, h); } c_ctx.fillStyle = saveStyle; -} +}; that.getCleanDirtyReset = function() { var v = viewport, c = cleanRect, cleanBox, dirtyBoxes = [], diff --git a/include/ui.js b/include/ui.js index 17afe8b3..fa41854c 100644 --- a/include/ui.js +++ b/include/ui.js @@ -302,7 +302,7 @@ updateState: function(rfb, state, oldstate, msg) { c.value = "Disconnect"; c.onclick = UI.disconnect; c.disabled = false; - cad.style.display = "block"; + cad.style.display = ""; UI.settingsDisabled(true, rfb); klass = "noVNC_status_normal"; break; @@ -497,7 +497,6 @@ addOption: function(selectbox,text,value ) setBarPosition: function() { $D('noVNC-control-bar').style.top = (window.pageYOffset) + 'px'; $D('noVNC_mobile_buttons').style.left = (window.pageXOffset) + 'px'; - $D('noVNC_buttons_right').style.right = 0 + 'px'; var vncwidth = $D('noVNC_screen').style.offsetWidth; $D('noVNC-control-bar').style.width = vncwidth + 'px'; diff --git a/tests/viewport.html b/tests/viewport.html index 9dcb53f1..fbbf286d 100644 --- a/tests/viewport.html +++ b/tests/viewport.html @@ -86,7 +86,7 @@ } function mouseMove(x, y) { - var deltaX, deltaY, x1, y1; + var deltaX, deltaY; if (inMove) { //deltaX = x - lastPos.x; // drag viewport diff --git a/vnc.html b/vnc.html index c3fe5ddb..f7159c60 100644 --- a/vnc.html +++ b/vnc.html @@ -48,7 +48,7 @@
-
+
-
+
-