Hopiu/fabric.js
1
0
Fork 0
mirror of https://github.com/Hopiu/fabric.js.git synced 2026-05-05 12:24:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Word widths on justified line of text were calculated incorrectly. (#3408)

Browse source 
* Calculation of word widths on justified line will now correctly take styles into account
* fix lint
This commit is contained in:
Marcin 2016-11-13 00:35:40 +01:00 committed by Andrea Bogazzi
parent c5f60743f5
commit f26a2dc8aa
2 changed files with 22 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/shapes/text.class.js
View file

@ -499,7 +499,7 @@
// stretch the line
var words = line.split(/\s+/),
charOffset = 0,
wordsWidth = this._getWidthOfWords(ctx, words.join(''), lineIndex, 0),
wordsWidth = this._getWidthOfWords(ctx, words.join(' '), lineIndex, 0),
widthDiff = this.width - wordsWidth,
numSpaces = words.length - 1,
spaceWidth = numSpaces > 0 ? widthDiff / numSpaces : 0,

21
test/unit/itext.js
View file

@ -791,4 +791,25 @@
style = doc.getElementsByTagName('style')[0].firstChild.data;
equal(style, '\n\t\t@font-face {\n\t\t\tfont-family: \'Plaster\';\n\t\t\tsrc: url(\'path-to-plaster-font-file\');\n\t\t}\n\t\t@font-face {\n\t\t\tfont-family: \'Engagement\';\n\t\t\tsrc: url(\'path-to-engagement-font-file\');\n\t\t}\n');
});
test('measuring width of words', function () {
var ctx = canvas.getContext('2d');
var text = 'test foo bar';
var iText = new fabric.IText(text, {
styles: {
0: {
9: { fontWeight: 'bold' },
10: { fontWeight: 'bold' },
11: { fontWeight: 'bold' },
}
}
});
var textSplitted = text.split(' ');
var measuredBy_getWidthOfWords_preservedSpaces = iText._getWidthOfWords(ctx, textSplitted.join(' '), 0, 0);
var measuredBy_getWidthOfWords_omittedSpaces = iText._getWidthOfWords(ctx, textSplitted.join(''), 0, 0);
notEqual(measuredBy_getWidthOfWords_preservedSpaces, measuredBy_getWidthOfWords_omittedSpaces);
});
})();