Commit c506a481 authored by Joel Martin's avatar Joel Martin

Only show move/drag button when clipping. Cleanup.

Cleanup:

- remove unused changeViewportMeta function from include/ui.js
- remove some debug output and debug CSS.
- rename panel toggle functions and put them in same location in the
  code.
- refactor some code from updateState to updateVisualState routine
  (renamed from updateSettingsState).
parent a5df24b4
...@@ -286,7 +286,6 @@ html { ...@@ -286,7 +286,6 @@ html {
} }
#noVNC_clipboard_text { #noVNC_clipboard_text {
width: 500px; width: 500px;
border-color: red;
} }
#noVNC_logo { #noVNC_logo {
...@@ -300,7 +299,6 @@ html { ...@@ -300,7 +299,6 @@ html {
} }
#noVNC_clipboard_text { #noVNC_clipboard_text {
width: 410px; width: 410px;
border-color: yellow;
} }
#noVNC_logo { #noVNC_logo {
font-size: 150px; font-size: 150px;
...@@ -314,7 +312,6 @@ html { ...@@ -314,7 +312,6 @@ html {
} }
#noVNC_clipboard_text { #noVNC_clipboard_text {
width: 250px; width: 250px;
border-color: green;
} }
#noVNC_logo { #noVNC_logo {
font-size: 110px; font-size: 110px;
...@@ -328,7 +325,6 @@ html { ...@@ -328,7 +325,6 @@ html {
} }
#noVNC_clipboard_text { #noVNC_clipboard_text {
width: 220px; width: 220px;
border-color: blue;
} }
#noVNC_logo { #noVNC_logo {
font-size: 90px; font-size: 90px;
......
...@@ -279,9 +279,6 @@ that.viewportChange = function(deltaX, deltaY, width, height) { ...@@ -279,9 +279,6 @@ that.viewportChange = function(deltaX, deltaY, width, height) {
if (v.w > 0 && v.h > 0 && c.width > 0 && c.height > 0) { if (v.w > 0 && v.h > 0 && c.width > 0 && c.height > 0) {
console.log("here1:",
((c.width < v.w) ? c.width : v.w),
((c.height < v.h) ? c.height : v.h));
saveImg = c_ctx.getImageData(0, 0, saveImg = c_ctx.getImageData(0, 0,
(c.width < v.w) ? c.width : v.w, (c.width < v.w) ? c.width : v.w,
(c.height < v.h) ? c.height : v.h); (c.height < v.h) ? c.height : v.h);
......
This diff is collapsed.
...@@ -84,15 +84,15 @@ ...@@ -84,15 +84,15 @@
<input type="image" src="images/clipboard.png" <input type="image" src="images/clipboard.png"
id="clipboardButton" class="noVNC_status_button" id="clipboardButton" class="noVNC_status_button"
value="Clipboard" title="Clipboard" value="Clipboard" title="Clipboard"
onclick="UI.showClipboard();" /> onclick="UI.toggleClipboardPanel();" />
<input type="image" src="images/settings.png" <input type="image" src="images/settings.png"
id="menuButton" class="noVNC_status_button" id="settingsButton" class="noVNC_status_button"
value="Settings" title="Settings" value="Settings" title="Settings"
onclick="UI.clickSettingsMenu();" /> onclick="UI.toggleSettingsPanel();" />
<input type="image" src="images/connect.png" <input type="image" src="images/connect.png"
id="connectPanelbutton" class="noVNC_status_button" id="connectButton" class="noVNC_status_button"
value="Connect" title="Connect" value="Connect" title="Connect"
onclick="UI.connectPanelbutton()" /> onclick="UI.toggleConnectPanel()" />
<input type="image" src="images/disconnect.png" <input type="image" src="images/disconnect.png"
id="disconnectButton" class="noVNC_status_button" id="disconnectButton" class="noVNC_status_button"
value="Disconnect" title="Disconnect" value="Disconnect" title="Disconnect"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment