Commit 8b46c0de authored by Solly Ross's avatar Solly Ross

Update UI to allow for different scaling modes

This commit updates the UI to allow for different
scaling modes.  The "resize" option was changed to
be a dropdown with the following options: "None" (nothing),
"Remote Resizing" (SetDesktopSize).
parent 7e161007
...@@ -46,7 +46,7 @@ var UI; ...@@ -46,7 +46,7 @@ var UI;
}, },
onresize: function (callback) { onresize: function (callback) {
if (UI.getSetting('resize')) { if (UI.getSetting('resize') === 'remote') {
var innerW = window.innerWidth; var innerW = window.innerWidth;
var innerH = window.innerHeight; var innerH = window.innerHeight;
var controlbarH = $D('noVNC-control-bar').offsetHeight; var controlbarH = $D('noVNC-control-bar').offsetHeight;
...@@ -104,7 +104,7 @@ var UI; ...@@ -104,7 +104,7 @@ var UI;
UI.initSetting('encrypt', (window.location.protocol === "https:")); UI.initSetting('encrypt', (window.location.protocol === "https:"));
UI.initSetting('true_color', true); UI.initSetting('true_color', true);
UI.initSetting('cursor', !UI.isTouchDevice); UI.initSetting('cursor', !UI.isTouchDevice);
UI.initSetting('resize', false); UI.initSetting('resize', 'off');
UI.initSetting('shared', true); UI.initSetting('shared', true);
UI.initSetting('view_only', false); UI.initSetting('view_only', false);
UI.initSetting('path', 'websockify'); UI.initSetting('path', 'websockify');
......
...@@ -157,10 +157,16 @@ ...@@ -157,10 +157,16 @@
<li><input id="noVNC_true_color" type="checkbox" checked> True Color</li> <li><input id="noVNC_true_color" type="checkbox" checked> True Color</li>
<li><input id="noVNC_cursor" type="checkbox"> Local Cursor</li> <li><input id="noVNC_cursor" type="checkbox"> Local Cursor</li>
<li><input id="noVNC_clip" type="checkbox"> Clip to Window</li> <li><input id="noVNC_clip" type="checkbox"> Clip to Window</li>
<li><input id="noVNC_resize" type="checkbox"> Resize Remote to Window</li>
<li><input id="noVNC_shared" type="checkbox"> Shared Mode</li> <li><input id="noVNC_shared" type="checkbox"> Shared Mode</li>
<li><input id="noVNC_view_only" type="checkbox"> View Only</li> <li><input id="noVNC_view_only" type="checkbox"> View Only</li>
<hr>
<li><input id="noVNC_path" type="input" value="websockify"> Path</li> <li><input id="noVNC_path" type="input" value="websockify"> Path</li>
<li><label>
<select id="noVNC_resize" name="vncResize">
<option value="off">None</option>
<option value="remote">Remote Resizing</option>
</select> Scaling Mode</label>
</li>
<li><input id="noVNC_repeaterID" type="input" value=""> Repeater ID</li> <li><input id="noVNC_repeaterID" type="input" value=""> Repeater ID</li>
<hr> <hr>
<!-- Stylesheet selection dropdown --> <!-- Stylesheet selection dropdown -->
......
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