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

GUACAMOLE-230: Merge mouse cursor size fix.

Browse Source
This commit is contained in:
James Muehlner
2017-03-07 17:09:25 -08:00
parent 6bcb983838 69ff583a07
commit 4a0de7fcc2
2 changed files with 32 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
guacamole-common-js/src/main/webapp/modules/Display.js
View File

@@ -423,7 +423,7 @@ Guacamole.Display = function() {
// Fire cursor change event
if (guac_display.oncursor)
guac_display.oncursor(cursor.getCanvas(), hotspotX, hotspotY);
guac_display.oncursor(cursor.toCanvas(), hotspotX, hotspotY);
});
};

34
guacamole-common-js/src/main/webapp/modules/Layer.js
View File

@@ -267,13 +267,41 @@ Guacamole.Layer = function(width, height) {
this.height = height;
/**
* Returns the canvas element backing this Layer.
* @returns {Element} The canvas element backing this Layer.
* Returns the canvas element backing this Layer. Note that the dimensions
* of the canvas may not exactly match those of the Layer, as resizing a
* canvas while maintaining its state is an expensive operation.
*
* @returns {HTMLCanvasElement}
* The canvas element backing this Layer.
*/
this.getCanvas = function() {
this.getCanvas = function getCanvas() {
return canvas;
};
/**
* Returns a new canvas element containing the same image as this Layer.
* Unlike getCanvas(), the canvas element returned is guaranteed to have
* the exact same dimensions as the Layer.
*
* @returns {HTMLCanvasElement}
* A new canvas element containing a copy of the image content this
* Layer.
*/
this.toCanvas = function toCanvas() {
// Create new canvas having same dimensions
var canvas = document.createElement('canvas');
canvas.width = layer.width;
canvas.height = layer.height;
// Copy image contents to new canvas
var context = canvas.getContext('2d');
context.drawImage(layer.getCanvas(), 0, 0);
return canvas;
};
/**
* Changes the size of this Layer to the given width and height. Resizing
* is only attempted if the new size provided is actually different from