safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-06 21:27:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUAC-637: Use setScale() only to set display scale. Update auto-fit checkbox from within setScale().

Browse Source
This commit is contained in:
Michael Jumper
2014-04-24 12:33:08 -07:00
parent a4642bd339
commit acddf8ff0e
1 changed files with 26 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
guacamole/src/main/webapp/scripts/client-ui.js
View File

@@ -769,6 +769,28 @@ GuacUI.Client.updateThumbnail = function() {
}; };
/**
* Sets the current display scale to the given value, where 1 is 100% (1:1
* pixel ratio). Out-of-range values will be clamped in-range.
*
* @param {Number} new_scale The new scale to apply
*/
GuacUI.Client.setScale = function(new_scale) {
new_scale = Math.max(new_scale, GuacUI.Client.min_zoom);
new_scale = Math.min(new_scale, GuacUI.Client.max_zoom);
if (GuacUI.Client.attachedClient)
GuacUI.Client.attachedClient.scale(new_scale);
GuacUI.Client.zoom_state.textContent = Math.round(new_scale * 100) + "%";
// Auto-fit is implicitly enabled at minimum zoom level
if (new_scale === GuacUI.Client.min_zoom)
GuacUI.Client.auto_fit.checked = true;
};
/** /**
* Updates the scale of the attached Guacamole.Client based on current window * Updates the scale of the attached Guacamole.Client based on current window
* size and "auto-fit" setting. * size and "auto-fit" setting.
@@ -786,25 +808,12 @@ GuacUI.Client.updateDisplayScale = function() {
// Clamp scale to minimum zoom level, keep at minimum zoom if at minimum zoom before // Clamp scale to minimum zoom level, keep at minimum zoom if at minimum zoom before
if (guac.getScale() < min_zoom || guac.getScale() === GuacUI.Client.min_zoom) { if (guac.getScale() < min_zoom || guac.getScale() === GuacUI.Client.min_zoom) {
guac.scale(min_zoom); GuacUI.Client.min_zoom = min_zoom;
GuacUI.Client.zoom_state.textContent = Math.round(min_zoom * 100) + "%"; GuacUI.Client.setScale(min_zoom);
} }
else
GuacUI.Client.min_zoom = min_zoom;
GuacUI.Client.min_zoom = min_zoom;
};
/**
* Sets the current display scale to the given value, where 1 is 100% (1:1
* pixel ratio). Out-of-range values will be clamped in-range.
*
* @param {Number} new_scale The new scale to apply
*/
GuacUI.Client.setScale = function(new_scale) {
new_scale = Math.max(new_scale, GuacUI.Client.min_zoom);
new_scale = Math.min(new_scale, GuacUI.Client.max_zoom);
guac.scale(new_scale);
GuacUI.Client.zoom_state.textContent = Math.round(new_scale * 100) + "%";
}; };
/** /**