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

Fix iPad synchronization issue (ticket #90).

Browse Source
This commit is contained in:
Michael Jumper
2012-04-03 02:18:47 -07:00
parent f6868b8661
commit 9e1d2b2442
1 changed files with 39 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
guacamole-common-js/src/main/resources/layer.js
View File

@@ -74,6 +74,19 @@ Guacamole.Layer = function(width, height) {
var displayContext = display.getContext("2d");
displayContext.save();
/**
* A temporary canvas element whose contents can be relied on only
* through the duration of an operation.
* @private
*/
var temp = document.createElement("canvas");
/**
* The 2D display context of the temporary canvas element.
* @private
*/
var tempContext = temp.getContext("2d");
/**
* The queue of all pending Tasks. Tasks will be run in order, with new
* tasks added at the end of the queue and old tasks removed from the
@@ -400,6 +413,15 @@ Guacamole.Layer = function(width, height) {
return display;
};
/**
* Returns the display context of the canvas element backing this layer.
* @returns {CanvasRenderingContext2D} The display context of the canvas
* element backing this layer.
*/
this.getContext = function() {
return displayContext;
};
/**
* Returns whether this Layer is ready. A Layer is ready if it has no
* pending operations and no operations in-progress.
@@ -570,8 +592,23 @@ Guacamole.Layer = function(width, height) {
if (layer.autosize != 0) fitRect(x, y, srcw, srch);
var srcCanvas = srcLayer.getCanvas();
if (srcCanvas.width != 0 && srcCanvas.height != 0)
displayContext.drawImage(srcCanvas, srcx, srcy, srcw, srch, x, y, srcw, srch);
if (srcCanvas.width != 0 && srcCanvas.height != 0) {
// Copy source data into temporary canvas (drawing from
// source canvas directly can cause the operation to be
// performed lazily by the underlying Canvas implementation,
// which undermines the sychronization built into these
// layers).
temp.width = srcw;
temp.height = srch;
tempContext.putImageData(
srcLayer.getContext().getImageData(srcx, srcy, srcw, srch),
0, 0);
// Draw from temporary canvas
displayContext.drawImage(temp, 0, 0, srcw, srch, x, y, srcw, srch);
}
});
};