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

Ensure width/height/DPI are sent as integers. Properly adjust display scale for reported pixel size.

Browse Source
This commit is contained in:
Michael Jumper
2014-01-01 20:57:21 -08:00
parent ea7e04505f
commit 3e20648343
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
guacamole/src/main/webapp/client.xhtml
View File

@@ -117,8 +117,8 @@
// Scale width/height to be at least 600x600 // Scale width/height to be at least 600x600
if (optimal_width < 600 || optimal_height < 600) { if (optimal_width < 600 || optimal_height < 600) {
var scale = Math.max(600 / optimal_width, 600 / optimal_height); var scale = Math.max(600 / optimal_width, 600 / optimal_height);
optimal_width = Math.floor(optimal_width * scale); optimal_width = optimal_width * scale;
optimal_height = Math.floor(optimal_height * scale); optimal_height = optimal_height * scale;
} }
// Get entire query string, and pass to connect(). // Get entire query string, and pass to connect().
@@ -128,9 +128,9 @@
var connect_string = var connect_string =
window.location.search.substring(1) window.location.search.substring(1)
+ "&width=" + optimal_width + "&width=" + Math.floor(optimal_width)
+ "&height=" + optimal_height + "&height=" + Math.floor(optimal_height)
+ "&dpi=" + optimal_dpi; + "&dpi=" + Math.floor(optimal_dpi);
// Add audio mimetypes to connect_string // Add audio mimetypes to connect_string
GuacUI.Audio.supported.forEach(function(mimetype) { GuacUI.Audio.supported.forEach(function(mimetype) {

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

@@ -618,6 +618,7 @@ 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);
// If auto-fit is enabled, scale display // If auto-fit is enabled, scale display
if (!GuacUI.Client.overrideAutoFit if (!GuacUI.Client.overrideAutoFit
@@ -630,14 +631,14 @@ GuacUI.Client.updateDisplayScale = function() {
); );
// Scale client // Scale client
if (fit_scale != guac.getScale()) if (guac.getScale() !== fit_scale)
guac.scale(fit_scale); guac.scale(fit_scale);
} }
// Otherwise, scale to 100% // Otherwise, scale to 100%
else if (guac.getScale() != 1.0) else if (guac.getScale() !== adjusted_scale)
guac.scale(1.0); guac.scale(adjusted_scale);
}; };