From f49271c89f67649bafb2c5dd3747b8f5030ec46c Mon Sep 17 00:00:00 2001 From: 0JARVIS0 <709406687@qq.com> Date: Fri, 29 Nov 2019 14:32:53 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E6=94=AF=E6=8C=81textDecoration?= =?UTF-8?q?=E5=AE=BD=E5=BA=A6=E8=87=AA=E9=80=82=E5=BA=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pen.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/pen.js b/lib/pen.js index aa70423..082d147 100644 --- a/lib/pen.js +++ b/lib/pen.js @@ -518,6 +518,8 @@ export default class Painter { this.ctx.fillText(text, x, y, measuredWith); } if (view.css.textDecoration) { + const fontSize = view.css.fontSize.toPx(); + this.ctx.lineWidth = fontSize / 13; this.ctx.beginPath(); this.ctx.moveTo(...this.callbackInfo.textDecoration.moveTo); this.ctx.lineTo(...this.callbackInfo.textDecoration.lineTo); @@ -612,6 +614,7 @@ export default class Painter { } const fontSize = view.css.fontSize.toPx(); if (view.css.textDecoration) { + this.ctx.lineWidth = fontSize / 13; this.ctx.beginPath(); if (/\bunderline\b/.test(view.css.textDecoration)) { this.ctx.moveTo(lineX, y); From 6c523d5a6125f7adfe78ec75cf2ea7403d5feb9d Mon Sep 17 00:00:00 2001 From: 0JARVIS0 <709406687@qq.com> Date: Fri, 29 Nov 2019 14:52:26 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=B8=A6decoratio?= =?UTF-8?q?n=E6=96=87=E5=AD=97=E6=97=A0=E6=B3=95=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pen.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/pen.js b/lib/pen.js index 082d147..7977576 100644 --- a/lib/pen.js +++ b/lib/pen.js @@ -521,8 +521,8 @@ export default class Painter { const fontSize = view.css.fontSize.toPx(); this.ctx.lineWidth = fontSize / 13; this.ctx.beginPath(); - this.ctx.moveTo(...this.callbackInfo.textDecoration.moveTo); - this.ctx.lineTo(...this.callbackInfo.textDecoration.lineTo); + this.ctx.moveTo(...this.movingCache.textDecoration.moveTo); + this.ctx.lineTo(...this.movingCache.textDecoration.lineTo); this.ctx.closePath(); this.ctx.strokeStyle = view.css.color; this.ctx.stroke();