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

GUACAMOLE-177: Tie all layer property changes to display frame flush.

Browse Source
This commit is contained in:
Michael Jumper
2016-10-06 21:51:40 -07:00
parent 8de93ad4ea
commit 47f2b95abc
2 changed files with 90 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
guacamole-common-js/src/main/webapp/modules/Client.js
View File

@@ -865,7 +865,7 @@ Guacamole.Client = function(tunnel) {
// Remove from parent
var layer = getLayer(layer_index);
layer.dispose();
display.dispose(layer);
// Delete reference
delete layers[layer_index];
@@ -893,7 +893,7 @@ Guacamole.Client = function(tunnel) {
// Only valid for visible layers (not buffers)
if (layer_index >= 0) {
var layer = getLayer(layer_index);
layer.distort(a, b, c, d, e, f);
display.distort(layer, a, b, c, d, e, f);
}
},
@@ -1049,7 +1049,7 @@ Guacamole.Client = function(tunnel) {
if (layer_index > 0 && parent_index >= 0) {
var layer = getLayer(layer_index);
var parent = getLayer(parent_index);
layer.move(parent, x, y, z);
display.move(layer, parent, x, y, z);
}
},
@@ -1151,7 +1151,7 @@ Guacamole.Client = function(tunnel) {
// Only valid for visible layers (not buffers)
if (layer_index >= 0) {
var layer = getLayer(layer_index);
layer.shade(a);
display.shade(layer, a);
}
},

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

@@ -988,6 +988,92 @@ Guacamole.Display = function() {
});
};
/**
* Removes the given layer container entirely, such that it is no longer
* contained within its parent layer, if any.
*
* @param {Guacamole.Display.VisibleLayer} layer
* The layer being removed from its parent.
*/
this.dispose = function dispose(layer) {
scheduleTask(function disposeLayer() {
layer.dispose();
});
};
/**
* Applies the given affine transform (defined with six values from the
* transform's matrix) to the given layer.
*
* @param {Guacamole.Display.VisibleLayer} layer
* The layer being distorted.
*
* @param {Number} a
* The first value in the affine transform's matrix.
*
* @param {Number} b
* The second value in the affine transform's matrix.
*
* @param {Number} c
* The third value in the affine transform's matrix.
*
* @param {Number} d
* The fourth value in the affine transform's matrix.
*
* @param {Number} e
* The fifth value in the affine transform's matrix.
*
* @param {Number} f
* The sixth value in the affine transform's matrix.
*/
this.distort = function distort(layer, a, b, c, d, e, f) {
scheduleTask(function distortLayer() {
layer.distort(a, b, c, d, e, f);
});
};
/**
* Moves the upper-left corner of the given layer to the given X and Y
* coordinate, sets the Z stacking order, and reparents the layer
* to the given parent layer.
*
* @param {Guacamole.Display.VisibleLayer} layer
* The layer being moved.
*
* @param {Guacamole.Display.VisibleLayer} parent
* The parent to set.
*
* @param {Number} x
* The X coordinate to move to.
*
* @param {Number} y
* The Y coordinate to move to.
*
* @param {Number} z
* The Z coordinate to move to.
*/
this.move = function move(layer, parent, x, y, z) {
scheduleTask(function moveLayer() {
layer.move(parent, x, y, z);
});
};
/**
* Sets the opacity of the given layer to the given value, where 255 is
* fully opaque and 0 is fully transparent.
*
* @param {Guacamole.Display.VisibleLayer} layer
* The layer whose opacity should be set.
*
* @param {Number} alpha
* The opacity to set.
*/
this.shade = function shade(layer, alpha) {
scheduleTask(function shadeLayer() {
layer.shade(alpha);
});
};
/**
* Sets the scale of the client display element such that it renders at
* a relatively smaller or larger size, without affecting the true