diff options
| author | Solly Ross <sross@redhat.com> | 2015-02-17 18:53:38 -0500 |
|---|---|---|
| committer | Solly Ross <sross@redhat.com> | 2015-02-27 17:13:51 -0500 |
| commit | 8b46c0deb027f06b9db0601d518d1b1490ece66c (patch) | |
| tree | 1a0a284c5c2f126f0eba3969e5daec2d8bcdd72a | |
| parent | 7e161007abe8338afc501e907993bf5a72e085d9 (diff) | |
| download | novnc-8b46c0deb027f06b9db0601d518d1b1490ece66c.tar.gz | |
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).
| -rw-r--r-- | include/ui.js | 4 | ||||
| -rw-r--r-- | vnc.html | 8 |
2 files changed, 9 insertions, 3 deletions
diff --git a/include/ui.js b/include/ui.js index e923ea8..57e630b 100644 --- a/include/ui.js +++ b/include/ui.js @@ -46,7 +46,7 @@ var UI; }, onresize: function (callback) { - if (UI.getSetting('resize')) { + if (UI.getSetting('resize') === 'remote') { var innerW = window.innerWidth; var innerH = window.innerHeight; var controlbarH = $D('noVNC-control-bar').offsetHeight; @@ -104,7 +104,7 @@ var UI; UI.initSetting('encrypt', (window.location.protocol === "https:")); UI.initSetting('true_color', true); UI.initSetting('cursor', !UI.isTouchDevice); - UI.initSetting('resize', false); + UI.initSetting('resize', 'off'); UI.initSetting('shared', true); UI.initSetting('view_only', false); UI.initSetting('path', 'websockify'); @@ -157,10 +157,16 @@ <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_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_view_only" type="checkbox"> View Only</li> + <hr> <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> <hr> <!-- Stylesheet selection dropdown --> |