Merge pull request 52045 from feature/119398-weights into master

anton-trackman · anton-trackman · commit 0431f5fd2244 · 2023-08-23T11:25:22.000Z
diff --git a/Editor/FigmaParser.cs b/Editor/FigmaParser.cs
@@ -999,7 +999,14 @@ void AddBackgroundImageForVectorNode()
                 }
                 void AddBorderWidth()
                 {
-                    borderWidth = mixin.strokeWeight;
+                    if (mixin.individualStrokeWeights is not null)
+                    {
+                        if (mixin.individualStrokeWeights.left > 0) borderLeftWidth = mixin.individualStrokeWeights.left;
+                        if (mixin.individualStrokeWeights.right > 0) borderRightWidth = mixin.individualStrokeWeights.right;
+                        if (mixin.individualStrokeWeights.top > 0) borderTopWidth = mixin.individualStrokeWeights.top;
+                        if (mixin.individualStrokeWeights.bottom > 0) borderBottomWidth = mixin.individualStrokeWeights.bottom;
+                    }
+                    else if (mixin.strokeWeight > 0) borderWidth = mixin.strokeWeight;
                 }
                 void AddBorderRadius(RectangleCornerMixin rectangleCornerMixin, CornerMixin cornerMixin)
                 {
diff --git a/Editor/Interface/Figma.Types.cs b/Editor/Interface/Figma.Types.cs
@@ -360,7 +360,8 @@ public interface GeometryMixin
             StrokeCap? strokeCap { get; set; }
             StrokeJoin? strokeJoin { get; set; }
             object[] strokeGeometry { get; set; }
-        }
+            IndividualStrokeWeights individualStrokeWeights { get; set; }
+    }
 
         public interface CornerMixin
         {

Original file line number	Diff line number	Diff line change
`@@ -999,7 +999,14 @@ void AddBackgroundImageForVectorNode()`
`999`	`999`	`}`
`1000`	`1000`	`void AddBorderWidth()`
`1001`	`1001`	`{`
`1002`		`- borderWidth = mixin.strokeWeight;`
	`1002`	`+ if (mixin.individualStrokeWeights is not null)`
	`1003`	`+ {`
	`1004`	`+ if (mixin.individualStrokeWeights.left > 0) borderLeftWidth = mixin.individualStrokeWeights.left;`
	`1005`	`+ if (mixin.individualStrokeWeights.right > 0) borderRightWidth = mixin.individualStrokeWeights.right;`
	`1006`	`+ if (mixin.individualStrokeWeights.top > 0) borderTopWidth = mixin.individualStrokeWeights.top;`
	`1007`	`+ if (mixin.individualStrokeWeights.bottom > 0) borderBottomWidth = mixin.individualStrokeWeights.bottom;`
	`1008`	`+ }`
	`1009`	`+ else if (mixin.strokeWeight > 0) borderWidth = mixin.strokeWeight;`
`1003`	`1010`	`}`
`1004`	`1011`	`void AddBorderRadius(RectangleCornerMixin rectangleCornerMixin, CornerMixin cornerMixin)`
`1005`	`1012`	`{`
Original file line number	Diff line number	Diff line change
`@@ -360,7 +360,8 @@ public interface GeometryMixin`
`360`	`360`	`StrokeCap? strokeCap { get; set; }`
`361`	`361`	`StrokeJoin? strokeJoin { get; set; }`
`362`	`362`	`object[] strokeGeometry { get; set; }`
`363`		`- }`
	`363`	`+ IndividualStrokeWeights individualStrokeWeights { get; set; }`
	`364`	`+ }`
`364`	`365`
`365`	`366`	`public interface CornerMixin`
`366`	`367`	`{`