lsm/konva
1
0
Fork 0
mirror of https://github.com/konvajs/konva.git synced 2025-04-05 20:48:28 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

added stage nestedTransformsEnabled flag

Browse Source
This commit is contained in:
Eric Rowell 2013-12-09 22:46:58 -08:00
parent 37c3ce1b47
commit 8b4deb004d
7 changed files with 80 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/Container.js
View File

@ -1,28 +1,8 @@
(function() {
var SPACE = ' ',
TRANSFORM_CHANGE_STR = [
'xChange.kinetic',
'yChange.kinetic',
'scaleXChange.kinetic',
'scaleYChange.kinetic',
'skewXChange.kinetic',
'skewYChange.kinetic',
'rotationChange.kinetic',
'offsetXChange.kinetic',
'offsetYChange.kinetic'
].join(SPACE);
Kinetic.Util.addMethods(Kinetic.Container, {
__init: function(config) {
this.children = new Kinetic.Collection();
Kinetic.Node.call(this, config);
this.on(TRANSFORM_CHANGE_STR, function() {
var stage = this.getStage();
if (stage) {
stage._enableNestedTransforms = true;
}
});
},
/**
* returns a {@link Kinetic.Collection} of direct descendant nodes

2
src/Context.js
View File

@ -227,7 +227,7 @@
var stage = shape.getStage(),
m;
if (stage && stage._enableNestedTransforms) {
if (stage && stage.isNestedTransformsEnabled()) {
m = shape.getAbsoluteTransform().getMatrix();
}
else {

7
src/Layer.js
View File

@ -314,17 +314,16 @@
Kinetic.Factory.addGetterSetter(Kinetic.Layer, 'hitGraphEnabled', true);
/**
* enable / disable hit graph
* enable/disable hit graph
* @name setHitGraphEnabled
* @method
* @memberof Kinetic.Layer.prototype
* @param {Boolean} enable
* @param {Boolean} enabled
* @returns {Node}
*/
/**
* get flag which determines if the layer is cleared or not
* before drawing
* determine if hit graph is enabled
* @name getHitGraphEnabled
* @method
* @memberof Kinetic.Layer.prototype

41
src/Stage.js
View File

@ -642,6 +642,26 @@
baseEvent = types[n];
this.content.addEventListener(baseEvent, handler, false);
}
},
/**
* enable nested transforms
* @method
* @memberof Kinetic.Stage.prototype
* @returns {Node}
*/
enableNestedTransforms: function() {
this.setNestedTransformsEnabled(true);
return this;
},
/**
* disable nested transforms
* @method
* @memberof Kinetic.Stage.prototype
* @returns {Node}
*/
disableNestedTransforms: function() {
this.setNestedTransformsEnabled(false);
return this;
}
});
Kinetic.Util.extend(Kinetic.Stage, Kinetic.Container);
@ -655,4 +675,25 @@
* @method
* @memberof Kinetic.Stage.prototype
*/
Kinetic.Factory.addGetterSetter(Kinetic.Stage, 'nestedTransformsEnabled', true);
/**
* enable/disable nested transforms
* @name setNestedTransformsEnabled
* @method
* @memberof Kinetic.Stage.prototype
* @param {Boolean} enabled
* @returns {Node}
*/
/**
* determine if nested transforms are enabled
* @name getNestedTransformsEnabled
* @method
* @memberof Kinetic.Stage.prototype
* @returns {Boolean}
*/
Kinetic.Stage.prototype.isNestedTransformsEnabled = Kinetic.Stage.prototype.getNestedTransformsEnabled;
})();

3
test/performance/common/random-squares.js
View File

@ -118,7 +118,8 @@
stage = new Kinetic.Stage({
container: "container",
width: 578,
height: 200
height: 200,
nestedTransformsEnabled: false
});
circlesLayer = new Kinetic.Layer({
hitGraphEnabled: false

38
test/unit/Container-test.js
View File

@ -1355,42 +1355,4 @@ suite('Container', function() {
layer.draw();
});
// ======================================================
test('stage._enableNestedTransforms flag', function(){
var stage = addStage();
var layer = new Kinetic.Layer();
var rect = new Kinetic.Rect({
x: 100,
y: 50,
width: 100,
height: 50,
fill: 'green',
stroke: 'blue'
});
layer.add(rect);
stage.add(layer);
assert.equal(rect.getX(), 100);
assert.equal(rect.getY(), 50);
var trace = layer.getContext().getTrace();
//console.log(trace);
assert.equal(trace, 'clearRect(0,0,578,200);save();transform(1,0,0,1,100,50);beginPath();rect(0,0,100,50);closePath();fillStyle=green;fill();lineWidth=2;strokeStyle=blue;stroke();restore();');
var relaxedTrace = layer.getContext().getTrace(true);
//console.log(relaxedTrace);
assert.equal(relaxedTrace, 'clearRect();save();transform();beginPath();rect();closePath();fillStyle;fill();lineWidth;strokeStyle;stroke();restore();');
assert.equal(stage._enableNestedTransforms, false, 'enableNestedTransforms should be false');
// changing any container transform property should permanately set the _enableNestedTransforms flag to true
layer.setX(1);
layer.setX(0);
assert.equal(stage._enableNestedTransforms, true, 'enableNestedTransforms should be true');
});
});

33
test/unit/Stage-test.js
View File

@ -427,4 +427,37 @@ suite('Stage', function() {
//console.log(stage.getStage());
});
// ======================================================
test('stage.nestedTransformEnabled', function(){
var stage = addStage();
var layer = new Kinetic.Layer();
var group = new Kinetic.Group();
var circle = new Kinetic.Circle({
x: 100,
y: 100,
radius: 70,
fill: 'green',
stroke: 'black',
strokeWidth: 4,
name: 'myCircle',
draggable: true
});
group.add(circle);
layer.add(group);
stage.add(layer);
assert.equal(stage.isNestedTransformsEnabled(), true);
stage.disableNestedTransforms();
assert.equal(stage.isNestedTransformsEnabled(), false);
stage.enableNestedTransforms();
assert.equal(stage.isNestedTransformsEnabled(), true);
});
});