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

fixed IText's cursor and text selection not ignoring charSpacing at the end of line (#5008) (#5009)

Browse source
This commit is contained in:
Nick Zaitsev 2018-05-30 03:53:17 -03:00 committed by Andrea Bogazzi
parent b1c25a4f56
commit b77957f3ec
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/shapes/itext.class.js
View file

@ -341,18 +341,19 @@
return this.cursorOffsetCache;
}
var lineLeftOffset,
lineIndex = 0,
charIndex = 0,
lineIndex,
charIndex,
topOffset = 0,
leftOffset = 0,
boundaries,
cursorPosition = this.get2DCursorLocation(position);
for (var i = 0; i < cursorPosition.lineIndex; i++) {
charIndex = cursorPosition.charIndex;
lineIndex = cursorPosition.lineIndex;
for (var i = 0; i < lineIndex; i++) {
topOffset += this.getHeightOfLine(i);
}
lineLeftOffset = this._getLineLeftOffset(cursorPosition.lineIndex);
var bound = this.__charBounds[cursorPosition.lineIndex][cursorPosition.charIndex];
lineLeftOffset = this._getLineLeftOffset(lineIndex);
var bound = this.__charBounds[lineIndex][charIndex];
bound && (leftOffset = bound.left);
if (this.charSpacing !== 0 && charIndex === this._textLines[lineIndex].length) {
leftOffset -= this._getWidthOfCharSpacing();
@ -429,7 +430,9 @@
boxEnd = this.__charBounds[endLine][endChar].left;
}
else {
boxEnd = this.__charBounds[endLine][endChar - 1].left + this.__charBounds[endLine][endChar - 1].width;
var charSpacing = this._getWidthOfCharSpacing();
boxEnd = this.__charBounds[endLine][endChar - 1].left
+ this.__charBounds[endLine][endChar - 1].width - charSpacing;
}
}
realLineHeight = lineHeight;