tianzixuan/Doric
Archived
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

android: when draw border ,do not draw out of cliped area.

Browse Source
This commit is contained in:
pengfei.zhou 2021-09-09 17:23:32 +08:00 committed by osborn
parent 116469d52c
commit 7eba842a55
1 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
doric-android/doric/src/main/java/pub/doric/shader/DoricLayer.java
View File

@ -89,9 +89,26 @@ public class DoricLayer extends MaximumFrameLayout {
if (mBorderPaint != null) { if (mBorderPaint != null) {
((ViewGroup) getParent()).setClipChildren(false); ((ViewGroup) getParent()).setClipChildren(false);
if (mCornerRadii != null) { if (mCornerRadii != null) {
canvas.drawRoundRect(mRect, mCornerRadii[0], mCornerRadii[1], mBorderPaint); if (mCornerRadii.length == 8 && (
mCornerRadii[0] != mCornerRadii[2]
|| mCornerRadii[0] != mCornerRadii[4]
|| mCornerRadii[0] != mCornerRadii[6]
)) {
canvas.save();
canvas.clipPath(mCornerPath);
canvas.drawPath(mCornerPath, mBorderPaint);
canvas.restore();
} else { } else {
canvas.save();
canvas.clipPath(mCornerPath);
canvas.drawRoundRect(mRect, mCornerRadii[0], mCornerRadii[1], mBorderPaint);
canvas.restore();
}
} else {
canvas.save();
canvas.clipRect(mRect);
canvas.drawRect(mRect, mBorderPaint); canvas.drawRect(mRect, mBorderPaint);
canvas.restore();
} }
} }
if (mShadowPaint != null) { if (mShadowPaint != null) {
@ -99,7 +116,15 @@ public class DoricLayer extends MaximumFrameLayout {
canvas.save(); canvas.save();
if (mCornerRadii != null) { if (mCornerRadii != null) {
canvas.clipPath(mCornerPath, Region.Op.DIFFERENCE); canvas.clipPath(mCornerPath, Region.Op.DIFFERENCE);
if (mCornerRadii.length == 8 && (
mCornerRadii[0] != mCornerRadii[2]
|| mCornerRadii[0] != mCornerRadii[4]
|| mCornerRadii[0] != mCornerRadii[6]
)) {
canvas.drawPath(mCornerPath, mShadowPaint);
} else {
canvas.drawRoundRect(mRect, mCornerRadii[0], mCornerRadii[1], mShadowPaint); canvas.drawRoundRect(mRect, mCornerRadii[0], mCornerRadii[1], mShadowPaint);
}
} else { } else {
canvas.clipRect(mRect, Region.Op.DIFFERENCE); canvas.clipRect(mRect, Region.Op.DIFFERENCE);
canvas.drawRect(mRect, mShadowPaint); canvas.drawRect(mRect, mShadowPaint);
@ -128,7 +153,7 @@ public class DoricLayer extends MaximumFrameLayout {
mBorderPaint.setAntiAlias(true); mBorderPaint.setAntiAlias(true);
mBorderPaint.setStyle(Paint.Style.STROKE); mBorderPaint.setStyle(Paint.Style.STROKE);
} }
mBorderPaint.setStrokeWidth(borderWidth); mBorderPaint.setStrokeWidth(borderWidth * 2);
mBorderPaint.setColor(borderColor); mBorderPaint.setColor(borderColor);
} }