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-640: Start min zoom at the default zoom of the guac client (100%). If already zoomed out to minimum, stay at minumum through resize.

Browse Source
This commit is contained in:
Michael Jumper
2014-04-23 19:39:54 -07:00
parent dc62788d86
commit 1a95ad62b1
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -225,7 +225,7 @@ GuacUI.Client = {
"expected_input_width" : 1, "expected_input_width" : 1,
"expected_input_height" : 1, "expected_input_height" : 1,
"min_zoom" : 0, "min_zoom" : 1,
"max_zoom" : 3, "max_zoom" : 3,
"connectionName" : "Guacamole", "connectionName" : "Guacamole",
@@ -773,16 +773,18 @@ GuacUI.Client.updateDisplayScale = function() {
// Currently attacched client // Currently attacched client
var guac = GuacUI.Client.attachedClient; var guac = GuacUI.Client.attachedClient;
var adjusted_scale = 1 / (window.devicePixelRatio || 1);
// Calculate scale to fit screen // Calculate scale to fit screen
GuacUI.Client.min_zoom = Math.min( var min_zoom = Math.min(
window.innerWidth / guac.getWidth(), window.innerWidth / guac.getWidth(),
window.innerHeight / guac.getHeight() window.innerHeight / guac.getHeight()
); );
if (guac.getScale() < GuacUI.Client.min_zoom) // Clamp scale to minimum zoom level, keep at minimum zoom if at minimum zoom before
guac.scale(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;
}; };