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

Merge pull request #196 from Kujiale-Mobile/heidao

Browse Source 
fix: 去除旧样式干扰，修复移动中字体颜色失效问题
This commit is contained in:
0JARVIS0 2019-11-26 19:07:43 +08:00 committed by GitHub
commit d6b8bdde68
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/pen.js
View File

@ -355,6 +355,11 @@ export default class Painter {
view.rect.minWidth = view.css.fontSize.toPx() + pd[1] + pd[3]; view.rect.minWidth = view.css.fontSize.toPx() + pd[1] + pd[3];
} }
view.css.bottom = undefined
view.css.right = undefined
view.css.left = `${view.rect.left}px`
view.css.top = `${view.rect.top}px`
this.ctx.rotate(angle); this.ctx.rotate(angle);
if (!notClip && view.css && view.css.borderRadius && view.type !== 'rect') { if (!notClip && view.css && view.css.borderRadius && view.type !== 'rect') {
this._doClip(view.css.borderRadius, width, height, view.css.borderStyle); this._doClip(view.css.borderRadius, width, height, view.css.borderStyle);
@ -496,6 +501,7 @@ export default class Painter {
height, height,
extra, extra,
} = this._preProcess(view, view.css.background && view.css.borderRadius); } = this._preProcess(view, view.css.background && view.css.borderRadius);
this.ctx.fillStyle = (view.css.color || 'black');
if (this.isMoving && JSON.stringify(this.movingCache) !== JSON.stringify({})) { if (this.isMoving && JSON.stringify(this.movingCache) !== JSON.stringify({})) {
this.globalWidth[view.id] = this.movingCache.globalWidth this.globalWidth[view.id] = this.movingCache.globalWidth
this.ctx.setTextAlign(view.css.textAlign ? view.css.textAlign : 'left'); this.ctx.setTextAlign(view.css.textAlign ? view.css.textAlign : 'left');
@ -521,7 +527,6 @@ export default class Painter {
} }
} }
} else { } else {
this.ctx.fillStyle = (view.css.color || 'black');
const { const {
lines, lines,
lineHeight, lineHeight,