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

加入 fontWeight 属性

Browse Source
This commit is contained in:
CPPAlien 2018-07-16 17:34:15 +08:00
parent c17b06dcd4
commit b8ffc14965
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/pen.js
View File

@ -103,8 +103,11 @@ export default class Painter {
let y; let y;
let extra; let extra;
if (view.type === 'text') { if (view.type === 'text') {
const fontWeight = view.css.fontWeight === 'bold' ? 'bold' : 'normal';
const fontSize = view.css.fontSize ? view.css.fontSize : '20rpx';
this.ctx.font = `normal ${fontWeight} ${fontSize.toPx()}px sans-serif`;
this.ctx.setFillStyle(view.css.color ? view.css.color : 'black'); this.ctx.setFillStyle(view.css.color ? view.css.color : 'black');
this.ctx.setFontSize(view.css.fontSize.toPx()); // this.ctx.setFontSize(view.css.fontSize.toPx());
const textLength = this.ctx.measureText(view.text).width; const textLength = this.ctx.measureText(view.text).width;
width = view.css.width ? view.css.width.toPx() : textLength; width = view.css.width ? view.css.width.toPx() : textLength;
// 计算行数 // 计算行数

2
painter.js
View File

@ -195,7 +195,7 @@ function setStringPrototype() {
let res = 0; let res = 0;
if (unit === 'rpx') { if (unit === 'rpx') {
res = value * screenK; res = Math.round(value * screenK);
} else if (unit === 'px') { } else if (unit === 'px') {
res = value; res = value;
} }