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

Fixed word wrapping behavior: last words of a multiline text should not be arbitrarily wrapped anymore.

Browse Source 
Fixed width padding not being used.
Removed unused _expandTextData method
This commit is contained in:
Louis Jolibois
2013-03-27 17:12:20 +01:00
parent 0c80f6e223
commit 823529f839
1 changed files with 15 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/shapes/Text.js
View File

@@ -192,22 +192,6 @@
_getContextFont: function() { _getContextFont: function() {
return this.getFontStyle() + SPACE + this.getFontSize() + PX_SPACE + this.getFontFamily(); return this.getFontStyle() + SPACE + this.getFontSize() + PX_SPACE + this.getFontFamily();
}, },
_expandTextData: function(arr) {
var len = arr.length;
n = 0,
text = EMPTY_STRING,
newArr = [];
for (n=0; n<len; n++) {
text = arr[n];
newArr.push({
text: text,
width: this._getTextSize(text).width
});
}
return newArr;
},
_addTextLine: function (line, width, height) { _addTextLine: function (line, width, height) {
return this.textArr.push({text: line, width: width}); return this.textArr.push({text: line, width: width});
}, },
@@ -227,7 +211,9 @@
height = this.attrs.height, height = this.attrs.height,
fixedWidth = width !== AUTO, fixedWidth = width !== AUTO,
fixedHeight = height !== AUTO, fixedHeight = height !== AUTO,
maxHeightPx = height - this.getPadding() * 2, padding = this.getPadding(),
maxWidth = width - padding * 2,
maxHeightPx = height - padding * 2,
currentHeightPx = 0, currentHeightPx = 0,
wrap = this.getWrap(), wrap = this.getWrap(),
shouldWrap = wrap !== NONE, shouldWrap = wrap !== NONE,
@@ -239,7 +225,7 @@
for (var i = 0, max = lines.length; i < max; ++i) { for (var i = 0, max = lines.length; i < max; ++i) {
var line = lines[i], var line = lines[i],
lineWidth = this._getTextWidth(line); lineWidth = this._getTextWidth(line);
if (fixedWidth && lineWidth > width) { if (fixedWidth && lineWidth > maxWidth) {
/* /*
* if width is fixed and line does not fit entirely * if width is fixed and line does not fit entirely
* break the line into multiple fitting lines * break the line into multiple fitting lines
@@ -255,7 +241,7 @@
var mid = (low + high) >>> 1, var mid = (low + high) >>> 1,
substr = line.slice(0, mid + 1), substr = line.slice(0, mid + 1),
substrWidth = this._getTextWidth(substr); substrWidth = this._getTextWidth(substr);
if (substrWidth <= width) { if (substrWidth <= maxWidth) {
low = mid + 1; low = mid + 1;
match = substr; match = substr;
matchWidth = substrWidth; matchWidth = substrWidth;
@@ -292,6 +278,16 @@
break; break;
} }
line = line.slice(low); line = line.slice(low);
if (line.length > 0) {
// Check if the remaining text would fit on one line
lineWidth = this._getTextWidth(line);
if (lineWidth <= maxWidth) {
// if it does, add the line and break out of the loop
this._addTextLine(line, lineWidth);
currentHeightPx += lineHeightPx;
break;
}
}
} else { } else {
// not even one character could fit in the element, abort // not even one character could fit in the element, abort
break; break;