open/PainterCore
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

view 的长宽支持百分比

Browse Source
This commit is contained in:
CPPAlien 2019-11-24 15:12:39 +08:00
parent 4005dd840e
commit 7138a38241
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/pen.js
View File

@ -201,7 +201,7 @@ export default class Painter {
const linesArray = [];
for (let i = 0; i < textArray.length; ++i) {
const textLength = this.ctx.measureText(textArray[i]).width;
const partWidth = view.css.width ? view.css.width.toPx() : textLength;
const partWidth = view.css.width ? view.css.width.toPx(false, this.style.width) : textLength;
const calLines = Math.ceil(textLength / partWidth);
width = partWidth > width ? partWidth : width;
lines += calLines;
@ -234,14 +234,14 @@ export default class Painter {
width = Math.round(view.sWidth / ratio);
height = Math.round(view.sHeight / ratio);
} else if (view.css.width === 'auto') {
height = view.css.height.toPx();
height = view.css.height.toPx(false, this.style.height);
width = view.sWidth / view.sHeight * height;
} else if (view.css.height === 'auto') {
width = view.css.width.toPx();
width = view.css.width.toPx(false, this.style.width);
height = view.sHeight / view.sWidth * width;
} else {
width = view.css.width.toPx();
height = view.css.height.toPx();
width = view.css.width.toPx(false, this.style.width);
height = view.css.height.toPx(false, this.style.height);
}
break;
}
@ -250,8 +250,8 @@ export default class Painter {
console.error('You should set width and height');
return;
}
width = view.css.width.toPx();
height = view.css.height.toPx();
width = view.css.width.toPx(false, this.style.width);
height = view.css.height.toPx(false, this.style.height);
break;
}
let x;