lsm/konva
1
0
Fork 0
mirror of https://github.com/konvajs/konva.git synced 2025-11-24 16:53:06 +08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:konvajs/konva

Browse Source
This commit is contained in:
Anton Lavrenov
2019-01-11 08:52:28 -05:00
parent 830eb53650 4571ea16b7
commit 60e425c596
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/shapes/Text.ts
View File

@@ -350,8 +350,8 @@ export class Text extends Shape {
lineHeightPx = this.lineHeight() * fontSize, lineHeightPx = this.lineHeight() * fontSize,
width = this.attrs.width, width = this.attrs.width,
height = this.attrs.height, height = this.attrs.height,
fixedWidth = width !== AUTO, fixedWidth = width !== AUTO && width !== undefined,
fixedHeight = height !== AUTO, fixedHeight = height !== AUTO && height !== undefined,
padding = this.padding(), padding = this.padding(),
maxWidth = width - padding * 2, maxWidth = width - padding * 2,
maxHeightPx = height - padding * 2, maxHeightPx = height - padding * 2,
@@ -364,11 +364,11 @@ export class Text extends Shape {
this.textArr = []; this.textArr = [];
getDummyContext().font = this._getContextFont(); getDummyContext().font = this._getContextFont();
var additionalWidth = shouldAddEllipsis
? this._getTextWidth(ELLIPSIS)
: 0;
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];
var additionalWidth = shouldAddEllipsis
? this._getTextWidth(ELLIPSIS)
: 0;
var lineWidth = this._getTextWidth(line); var lineWidth = this._getTextWidth(line);
if (fixedWidth && lineWidth > maxWidth) { if (fixedWidth && lineWidth > maxWidth) {