zoriya/react-native-svg
1
0
Fork 0
mirror of https://github.com/zoriya/react-native-svg.git synced 2026-06-03 07:06:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix fillrule bug on Android

Browse Source
This commit is contained in:
Horcrux
2016-04-23 23:01:24 +08:00
parent 5e32544e22
commit 5b630f1e4a
1 changed files with 40 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/src/main/java/com/horcrux/svg/RNSVGPathShadowNode.java
+40 -28
View File
@@ -57,25 +57,31 @@ public class RNSVGPathShadowNode extends RNSVGVirtualNode {
private int mStrokeLinecap = CAP_ROUND; private int mStrokeLinecap = CAP_ROUND;
private int mStrokeLinejoin = JOIN_ROUND; private int mStrokeLinejoin = JOIN_ROUND;
private int mFillRule = FILL_RULE_NONZERO; private int mFillRule = FILL_RULE_NONZERO;
private boolean mFillRuleSet;
private boolean mPathSet;
private float[] mShapePath;
private Point mPaint; private Point mPaint;
@ReactProp(name = "d") @ReactProp(name = "d")
public void setPath(@Nullable ReadableArray shapePath) { public void setPath(@Nullable ReadableArray shapePath) {
float[] pathData = PropHelper.toFloatArray(shapePath); mShapePath = PropHelper.toFloatArray(shapePath);
Path path = new Path(); mPathSet = true;
switch (mFillRule) { setupPath();
case FILL_RULE_EVENODD: markUpdated();
path.setFillType(Path.FillType.EVEN_ODD); }
break;
case FILL_RULE_NONZERO:
break;
default:
throw new JSApplicationIllegalArgumentException(
"fillRule " + mFillRule + " unrecognized");
}
mPath = super.createPath(pathData, path); @ReactProp(name = "fill")
public void setFill(@Nullable ReadableArray fillColors) {
mFillColor = PropHelper.toFloatArray(fillColors);
markUpdated();
}
@ReactProp(name = "fillRule", defaultInt = FILL_RULE_NONZERO)
public void setFillRule(int fillRule) {
mFillRule = fillRule;
mFillRuleSet = true;
setupPath();
markUpdated(); markUpdated();
} }
@@ -103,20 +109,6 @@ public class RNSVGPathShadowNode extends RNSVGVirtualNode {
markUpdated(); markUpdated();
} }
@ReactProp(name = "fill")
public void setFill(@Nullable ReadableArray fillColors) {
mFillColor = PropHelper.toFloatArray(fillColors);
markUpdated();
}
@ReactProp(name = "fillRule", defaultInt = FILL_RULE_NONZERO)
public void setFillRule(int fillRule) {
mFillRule = fillRule;
markUpdated();
}
@ReactProp(name = "strokeWidth", defaultFloat = 1f) @ReactProp(name = "strokeWidth", defaultFloat = 1f)
public void setStrokeWidth(float strokeWidth) { public void setStrokeWidth(float strokeWidth) {
mStrokeWidth = strokeWidth; mStrokeWidth = strokeWidth;
@@ -159,6 +151,26 @@ public class RNSVGPathShadowNode extends RNSVGVirtualNode {
markUpdateSeen(); markUpdateSeen();
} }
private void setupPath() {
// init path after both fillRule and path have been set
if (mFillRuleSet && mPathSet) {
Path path = new Path();
switch (mFillRule) {
case FILL_RULE_EVENODD:
path.setFillType(Path.FillType.EVEN_ODD);
break;
case FILL_RULE_NONZERO:
break;
default:
throw new JSApplicationIllegalArgumentException(
"fillRule " + mFillRule + " unrecognized");
}
mPath = super.createPath(mShapePath, path);
}
}
/* /*
* sorting stops and stopsColors from array * sorting stops and stopsColors from array
*/ */