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

strokeScaleEnabled = false is disabled for text

Browse Source
This commit is contained in:
lavrton
2015-01-22 16:59:05 +07:00
parent 4dfc65dba4
commit d6cfd29962
7 changed files with 53 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bower.json
View File

@@ -1,6 +1,6 @@
{ {
"name": "KineticJS", "name": "KineticJS",
"version": "5.1.10", "version": "5.2.0",
"authors": [ "authors": [
"Eric Rowell", "Anton Lavrenov" "Eric Rowell", "Anton Lavrenov"
], ],

12
kinetic.js
View File

@@ -2055,7 +2055,7 @@ var Kinetic = {};
strokeScaleEnabled = shape.getStrokeScaleEnabled(); strokeScaleEnabled = shape.getStrokeScaleEnabled();
if(shape.hasStroke()) { if(shape.hasStroke()) {
if (!strokeScaleEnabled) { if (!strokeScaleEnabled && !(shape instanceof Kinetic.Text)) {
this.save(); this.save();
this.setTransform(1, 0, 0, 1, 0, 0); this.setTransform(1, 0, 0, 1, 0, 0);
} }
@@ -10611,6 +10611,7 @@ var Kinetic = {};
} }
else { else {
// arcTo would be nicer, but browser support is patchy (Opera) // arcTo would be nicer, but browser support is patchy (Opera)
cornerRadius = Math.min(cornerRadius, width / 2, height / 2);
context.moveTo(cornerRadius, 0); context.moveTo(cornerRadius, 0);
context.lineTo(width - cornerRadius, 0); context.lineTo(width - cornerRadius, 0);
context.arc(width - cornerRadius, cornerRadius, cornerRadius, Math.PI * 3 / 2, 0, false); context.arc(width - cornerRadius, cornerRadius, cornerRadius, Math.PI * 3 / 2, 0, false);
@@ -11978,8 +11979,13 @@ var Kinetic = {};
context.setAttr('textBaseline', MIDDLE); context.setAttr('textBaseline', MIDDLE);
context.setAttr('textAlign', LEFT); context.setAttr('textAlign', LEFT);
context.save(); context.save();
context.translate(p, 0); if (p) {
context.translate(0, p + textHeight / 2); context.translate(p, 0);
context.translate(0, p + textHeight / 2);
} else {
context.translate(0, textHeight / 2);
}
// draw text lines // draw text lines
for(n = 0; n < textArrLen; n++) { for(n = 0; n < textArrLen; n++) {

6
kinetic.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
src/Context.js
View File

@@ -517,7 +517,7 @@
strokeScaleEnabled = shape.getStrokeScaleEnabled(); strokeScaleEnabled = shape.getStrokeScaleEnabled();
if(shape.hasStroke()) { if(shape.hasStroke()) {
if (!strokeScaleEnabled) { if (!strokeScaleEnabled && !(shape instanceof Kinetic.Text)) {
this.save(); this.save();
this.setTransform(1, 0, 0, 1, 0, 0); this.setTransform(1, 0, 0, 1, 0, 0);
} }

9
src/shapes/Text.js
View File

@@ -104,8 +104,13 @@
context.setAttr('textBaseline', MIDDLE); context.setAttr('textBaseline', MIDDLE);
context.setAttr('textAlign', LEFT); context.setAttr('textAlign', LEFT);
context.save(); context.save();
context.translate(p, 0); if (p) {
context.translate(0, p + textHeight / 2); context.translate(p, 0);
context.translate(0, p + textHeight / 2);
} else {
context.translate(0, textHeight / 2);
}
// draw text lines // draw text lines
for(n = 0; n < textArrLen; n++) { for(n = 0; n < textArrLen; n++) {

2
test/unit/plugins/Label-test.js
View File

@@ -57,7 +57,7 @@ suite('Label', function() {
// resulting in slightly different tag dimensions // resulting in slightly different tag dimensions
var relaxedTrace = layer.getContext().getTrace(true); var relaxedTrace = layer.getContext().getTrace(true);
assert.equal(relaxedTrace, 'clearRect();save();save();globalAlpha;shadowColor;shadowBlur;shadowOffsetX;shadowOffsetY;drawImage();restore();drawImage();restore();save();transform();font;textBaseline;textAlign;save();translate();translate();save();fillStyle;fillText();restore();translate();restore();restore();clearRect();save();save();globalAlpha;shadowColor;shadowBlur;shadowOffsetX;shadowOffsetY;drawImage();restore();drawImage();restore();save();transform();font;textBaseline;textAlign;save();translate();translate();save();fillStyle;fillText();restore();translate();restore();restore();'); assert.equal(relaxedTrace, 'clearRect();save();save();globalAlpha;shadowColor;shadowBlur;shadowOffsetX;shadowOffsetY;drawImage();restore();drawImage();restore();save();transform();font;textBaseline;textAlign;save();translate();save();fillStyle;fillText();restore();translate();restore();restore();clearRect();save();save();globalAlpha;shadowColor;shadowBlur;shadowOffsetX;shadowOffsetY;drawImage();restore();drawImage();restore();save();transform();font;textBaseline;textAlign;save();translate();save();fillStyle;fillText();restore();translate();restore();restore();');
}); });

31
test/unit/shapes/Text-test.js
View File

@@ -313,5 +313,36 @@ suite('Text', function(){
assert.equal(text.fill(), 'black'); assert.equal(text.fill(), 'black');
}); });
test('text with stoke and strokeScaleEnabled', function() {
var stage = addStage();
var layer = new Kinetic.Layer();
var text = new Kinetic.Text({
fontSize: 50,
y : 50,
x : 50,
fill: 'black',
text: 'text',
stroke : 'red',
strokeScaleEnabled: false,
strokeWidth:2,
scaleX : 2
});
layer.add(text);
stage.add(layer);
var canvas = createCanvas();
var context = canvas.getContext('2d');
context.translate(50, 50);
context.lineWidth = 2;
context.font = '50px Arial';
context.strokeStyle = 'red';
context.scale(2, 1);
context.textBaseline = 'middle';
context.fillText('text', 0, 25);
context.strokeText('text', 0, 25);
compareLayerAndCanvas(layer, canvas);
});
}); });