From 9024a1f8029160283b8175be561e7b425dd15937 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Fri, 5 Dec 2014 13:56:20 -0800 Subject: [PATCH 1/3] GUAC-898: Send new display size to Guacamole when window size changes. --- .../src/main/webapp/app/client/directives/guacClient.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/guacamole/src/main/webapp/app/client/directives/guacClient.js b/guacamole/src/main/webapp/app/client/directives/guacClient.js index 3a51729c9..f736e4ed9 100644 --- a/guacamole/src/main/webapp/app/client/directives/guacClient.js +++ b/guacamole/src/main/webapp/app/client/directives/guacClient.js @@ -427,7 +427,15 @@ angular.module('client').directive('guacClient', [function guacClient() { // If the window is resized, attempt to resize client $window.addEventListener('resize', function onResizeWindow() { + + // Send new display size, if changed + if (client && display) { + if (display.getWidth() !== main.offsetWidth || display.getHeight() !== main.offsetHeight) + client.sendSize(main.offsetWidth, main.offsetHeight); + } + $scope.safeApply(updateDisplayScale); + }); /* From c9f485afbc21e4ab2dcd8f421d528899a4678bae Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Fri, 5 Dec 2014 15:08:26 -0800 Subject: [PATCH 2/3] GUAC-898: Adjust width/height based on browser resolution. --- .../main/webapp/app/client/directives/guacClient.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/guacamole/src/main/webapp/app/client/directives/guacClient.js b/guacamole/src/main/webapp/app/client/directives/guacClient.js index f736e4ed9..d5d80e5ab 100644 --- a/guacamole/src/main/webapp/app/client/directives/guacClient.js +++ b/guacamole/src/main/webapp/app/client/directives/guacClient.js @@ -430,8 +430,14 @@ angular.module('client').directive('guacClient', [function guacClient() { // Send new display size, if changed if (client && display) { - if (display.getWidth() !== main.offsetWidth || display.getHeight() !== main.offsetHeight) - client.sendSize(main.offsetWidth, main.offsetHeight); + + var pixel_density = $window.devicePixelRatio || 1; + var width = main.offsetWidth * pixel_density; + var height = main.offsetHeight * pixel_density; + + if (display.getWidth() !== width || display.getHeight() !== height) + client.sendSize(width, height); + } $scope.safeApply(updateDisplayScale); From c23d3e27e9b53c420e7b0b10756349f4c61c6296 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Sun, 7 Dec 2014 01:02:54 -0800 Subject: [PATCH 3/3] GUAC-898: Use camelCase for new code. --- .../src/main/webapp/app/client/directives/guacClient.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/guacamole/src/main/webapp/app/client/directives/guacClient.js b/guacamole/src/main/webapp/app/client/directives/guacClient.js index d5d80e5ab..20b1114c6 100644 --- a/guacamole/src/main/webapp/app/client/directives/guacClient.js +++ b/guacamole/src/main/webapp/app/client/directives/guacClient.js @@ -431,9 +431,9 @@ angular.module('client').directive('guacClient', [function guacClient() { // Send new display size, if changed if (client && display) { - var pixel_density = $window.devicePixelRatio || 1; - var width = main.offsetWidth * pixel_density; - var height = main.offsetHeight * pixel_density; + var pixelDensity = $window.devicePixelRatio || 1; + var width = main.offsetWidth * pixelDensity; + var height = main.offsetHeight * pixelDensity; if (display.getWidth() !== width || display.getHeight() !== height) client.sendSize(width, height);