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

GUAC-637: Update contents of zoom state when scale is changed.

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

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

@@ -785,13 +785,28 @@ 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); guac.scale(min_zoom);
GuacUI.Client.zoom_state.textContent = Math.round(min_zoom * 100) + "%";
}
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) + "%";
};
/** /**
* Updates the document title based on the connection name. * Updates the document title based on the connection name.
*/ */
@@ -1686,9 +1701,7 @@ GuacUI.Client.attach = function(guac) {
// Rescale based on new ratio // Rescale based on new ratio
var new_scale = initial_scale * ratio; var new_scale = initial_scale * ratio;
new_scale = Math.max(new_scale, GuacUI.Client.min_zoom); GuacUI.Client.setScale(new_scale);
new_scale = Math.min(new_scale, GuacUI.Client.max_zoom);
guac.scale(new_scale);
// Calculate point at currently at center of touch // Calculate point at currently at center of touch
var point_at_center_x = (x + GuacUI.Client.main.scrollLeft) / new_scale; var point_at_center_x = (x + GuacUI.Client.main.scrollLeft) / new_scale;