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

border 支持 百分比

Browse Source
This commit is contained in:
CPPAlien 2019-11-25 09:32:26 +08:00
parent ed1f6b56fa
commit 0b14d3990d
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/pen.js
View File

@ -90,18 +90,19 @@ export default class Painter {
r2 = 0, r2 = 0,
r3 = 0, r3 = 0,
r4 = 0 r4 = 0
const minSize = Math.min(width, height);
if (borderRadius) { if (borderRadius) {
const border = borderRadius.split(/\s+/) const border = borderRadius.split(/\s+/)
if (border.length === 4) { if (border.length === 4) {
r1 = Math.min(border[0].toPx(), width / 2, height / 2); r1 = Math.min(border[0].toPx(false, minSize), width / 2, height / 2);
r2 = Math.min(border[1].toPx(), width / 2, height / 2); r2 = Math.min(border[1].toPx(false, minSize), width / 2, height / 2);
r3 = Math.min(border[2].toPx(), width / 2, height / 2); r3 = Math.min(border[2].toPx(false, minSize), width / 2, height / 2);
r4 = Math.min(border[3].toPx(), width / 2, height / 2); r4 = Math.min(border[3].toPx(false, minSize), width / 2, height / 2);
} else { } else {
r1 = r2 = r3 = r4 = Math.min(borderRadius && borderRadius.toPx(), width / 2, height / 2); r1 = r2 = r3 = r4 = Math.min(borderRadius && borderRadius.toPx(false, minSize), width / 2, height / 2);
} }
} }
const lineWidth = borderWidth && borderWidth.toPx(); const lineWidth = borderWidth && borderWidth.toPx(false, minSize);
this.ctx.lineWidth = lineWidth; this.ctx.lineWidth = lineWidth;
if (borderStyle === 'dashed') { if (borderStyle === 'dashed') {
this.ctx.setLineDash([lineWidth * 4 / 3, lineWidth * 4 / 3]); this.ctx.setLineDash([lineWidth * 4 / 3, lineWidth * 4 / 3]);