Merge pull request 59720 from feature/160310-backgroundStyle into master

Author: anton-trackman

Editor/FigmaParser.cs

@@ -7,6 +7,7 @@
 using System.Xml;
 using UnityEngine;
 using Trackman;
+using UnityEngine.UIElements;
 
 // ReSharper disable UnusedMember.Local
 // ReSharper disable UnusedParameter.Local
@@ -131,13 +132,6 @@ enum FontStyle
                 BoldAndItalic
             }
 
-            enum ScaleMode
-            {
-                StretchToFill,
-                ScaleAndCrop,
-                ScaleToFit
-            }
-
             enum TextAlign
             {
                 UpperLeft,
@@ -588,7 +582,10 @@ struct CursorProperty
             // Background
             ColorProperty backgroundColor { get => Get("background-color"); set => Set("background-color", value); }
             AssetProperty backgroundImage { get => Get("background-image"); set => Set("background-image", value); }
-            EnumProperty<ScaleMode> unityBackgroundScaleMode { get => Get("-unity-background-scale-mode"); set => Set("-unity-background-scale-mode", value); }
+            EnumProperty<BackgroundPositionKeyword> unityBackgroundPositionX { get => Get("background-position-x"); set => Set("background-position-x", value); }
+            EnumProperty<BackgroundPositionKeyword> unityBackgroundPositionY { get => Get("background-position-y"); set => Set("background-position-y", value); }
+            EnumProperty<Repeat> unityBackgroundRepeat { get => Get("background-repeat"); set => Set("background-repeat", value); }
+            EnumProperty<BackgroundSizeType> unityBackgroundSize { get => Get("background-size"); set => Set("background-size", value); }
             ColorProperty unityBackgroundImageTintColor { get => Get("-unity-background-image-tint-color"); set => Set("-unity-background-image-tint-color", value); }
             // Slicing
             IntegerProperty unitySliceLeft { get => Get("-unity-slice-left"); set => Set("-unity-slice-left", value); }
@@ -642,6 +639,9 @@ public UssStyle(string name)
                         unityFontDefinition = Unit.Initial;
                         justifyContent = JustifyContent.Center;
                         alignItems = Align.Center;
+                        unityBackgroundPositionX = BackgroundPositionKeyword.Center;
+                        unityBackgroundPositionY = BackgroundPositionKeyword.Center;
+                        unityBackgroundRepeat = Repeat.NoRepeat;
                         break;
 
                     case viewportClass:
@@ -1408,12 +1408,12 @@ void AddFillStyle(IEnumerable<Paint> fills)
 
                         switch (image.scaleMode)
                         {
-                            case global.ScaleMode.FILL:
-                                unityBackgroundScaleMode = ScaleMode.ScaleAndCrop;
+                            case ScaleMode.FILL:
+                                unityBackgroundSize = BackgroundSizeType.Cover;
                                 break;
 
-                            case global.ScaleMode.FIT:
-                                unityBackgroundScaleMode = ScaleMode.ScaleToFit;
+                            case ScaleMode.FIT:
+                                unityBackgroundSize = BackgroundSizeType.Contain;
                                 break;
                         }
                     }

Runtime/Extensions/NodeExtensions.cs

@@ -320,7 +320,10 @@ public static void CopyResolvedStyle(this VisualElement value, VisualElement sou
                 if (valueResolvedStyle.opacity != sourceResolvedStyle.opacity) style.opacity = sourceResolvedStyle.opacity;
                 if (valueResolvedStyle.visibility != sourceResolvedStyle.visibility) style.visibility = sourceResolvedStyle.visibility;
                 if (valueResolvedStyle.unityBackgroundImageTintColor != sourceResolvedStyle.unityBackgroundImageTintColor) style.unityBackgroundImageTintColor = sourceResolvedStyle.unityBackgroundImageTintColor;
-                if (valueResolvedStyle.unityBackgroundScaleMode != sourceResolvedStyle.unityBackgroundScaleMode) style.unityBackgroundScaleMode = sourceResolvedStyle.unityBackgroundScaleMode;
+                if (valueResolvedStyle.backgroundPositionX != sourceResolvedStyle.backgroundPositionX) style.backgroundPositionX = sourceResolvedStyle.backgroundPositionX;
+                if (valueResolvedStyle.backgroundPositionY != sourceResolvedStyle.backgroundPositionY) style.backgroundPositionY = sourceResolvedStyle.backgroundPositionY;
+                if (valueResolvedStyle.backgroundRepeat != sourceResolvedStyle.backgroundRepeat) style.backgroundRepeat = sourceResolvedStyle.backgroundRepeat;
+                if (valueResolvedStyle.backgroundSize != sourceResolvedStyle.backgroundSize) style.backgroundSize = sourceResolvedStyle.backgroundSize;
                 if (valueResolvedStyle.backgroundImage != sourceResolvedStyle.backgroundImage) style.backgroundImage = sourceResolvedStyle.backgroundImage;
                 if (valueResolvedStyle.backgroundColor != sourceResolvedStyle.backgroundColor) style.backgroundColor = sourceResolvedStyle.backgroundColor;
                 if (valueResolvedStyle.color != sourceResolvedStyle.color) style.color = sourceResolvedStyle.color;
@@ -438,7 +441,10 @@ public static void CopyStyle(this VisualElement value, VisualElement source, Cop
                 if (sourceStyle.backgroundImage.keyword != StyleKeyword.Null && valueStyle.backgroundImage != sourceStyle.backgroundImage) valueStyle.backgroundImage = sourceStyle.backgroundImage;
                 if (sourceStyle.backgroundColor.keyword != StyleKeyword.Null && valueStyle.backgroundColor != sourceStyle.backgroundColor) valueStyle.backgroundColor = sourceStyle.backgroundColor;
                 if (sourceStyle.unityBackgroundImageTintColor.keyword != StyleKeyword.Null && valueStyle.unityBackgroundImageTintColor != sourceStyle.unityBackgroundImageTintColor) valueStyle.unityBackgroundImageTintColor = sourceStyle.unityBackgroundImageTintColor;
-                if (sourceStyle.unityBackgroundScaleMode.keyword != StyleKeyword.Null && valueStyle.unityBackgroundScaleMode != sourceStyle.unityBackgroundScaleMode) valueStyle.unityBackgroundScaleMode = sourceStyle.unityBackgroundScaleMode;
+                if (sourceStyle.backgroundPositionX.keyword != StyleKeyword.Null && valueStyle.backgroundPositionX != sourceStyle.backgroundPositionX) valueStyle.backgroundPositionX = sourceStyle.backgroundPositionX;
+                if (sourceStyle.backgroundPositionY.keyword != StyleKeyword.Null && valueStyle.backgroundPositionY != sourceStyle.backgroundPositionY) valueStyle.backgroundPositionY = sourceStyle.backgroundPositionY;
+                if (sourceStyle.backgroundRepeat.keyword != StyleKeyword.Null && valueStyle.backgroundRepeat != sourceStyle.backgroundRepeat) valueStyle.backgroundRepeat = sourceStyle.backgroundRepeat;
+                if (sourceStyle.backgroundSize.keyword != StyleKeyword.Null && valueStyle.backgroundSize != sourceStyle.backgroundSize) valueStyle.backgroundSize = sourceStyle.backgroundSize;
             }
 
             if (copyMask.HasFlag(CopyStyleMask.Padding))