add conditionals for old unity versions

ReactUnity · Nov 11, 2023 · e73a927 · e73a927
1 parent 74abcf3
commit e73a927
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 37 deletions.
diff --git a/Runtime/Frameworks/UIToolkit/Components/UIToolkitComponent.cs b/Runtime/Frameworks/UIToolkit/Components/UIToolkitComponent.cs
@@ -143,10 +143,12 @@ protected override void ApplyStylesSelf()
             TargetElement.style.borderLeftColor = StylingHelpers.GetStyleBorderColor(computed, StyleProperties.borderLeftColor);
             TargetElement.style.borderRightColor = StylingHelpers.GetStyleBorderColor(computed, StyleProperties.borderRightColor);
 
+#if UNITY_2022_3_OR_NEWER
             TargetElement.style.backgroundPositionX = StylingHelpers.GetStyleBackgroundPosition(computed, StyleProperties.backgroundPositionX);
             TargetElement.style.backgroundPositionY = StylingHelpers.GetStyleBackgroundPosition(computed, StyleProperties.backgroundPositionY);
             TargetElement.style.backgroundSize = StylingHelpers.GetStyleBackgroundSize(computed, StyleProperties.backgroundSize);
             TargetElement.style.backgroundRepeat = StylingHelpers.GetStyleBackgroundRepeat(computed, StyleProperties.backgroundRepeatX, StyleProperties.backgroundRepeatY);
+#endif
 
             TargetElement.style.letterSpacing = StylingHelpers.GetStyleFloat(computed, StyleProperties.letterSpacing).value;
             TargetElement.style.wordSpacing = StylingHelpers.GetStyleFloat(computed, StyleProperties.wordSpacing).value;

diff --git a/Runtime/Frameworks/UIToolkit/General/StylingHelpers.cs b/Runtime/Frameworks/UIToolkit/General/StylingHelpers.cs
@@ -127,6 +127,44 @@ public static StyleLength GetStyleLength(NodeStyle style, StyleProperty<YogaValu
             else return StyleKeyword.Null;
         }
 
+        public static StyleLength GetStyleLengthDouble(NodeStyle style, StyleProperty<YogaValue> prop, StyleProperty<YogaValue> prop2)
+        {
+            if (style.HasValue(prop)) return YogaValueToStyleLength(style.GetStyleValue<YogaValue>(prop));
+            if (style.HasValue(prop2)) return YogaValueToStyleLength(style.GetStyleValue<YogaValue>(prop2));
+            else return StyleKeyword.Null;
+        }
+
+        public static StyleEnum<T> GetStyleEnum<T>(NodeStyle style, StyleProperty<T> prop) where T : struct, IConvertible
+        {
+            if (style.HasValue(prop)) return style.GetStyleValue<T>(prop);
+            else return StyleKeyword.Null;
+        }
+
+        public static StyleEnum<T> GetStyleEnumCustom<T>(NodeStyle style, IStyleProperty prop) where T : struct, IConvertible
+        {
+            if (style.HasValue(prop)) return style.GetStyleValue<T>(prop);
+            else return StyleKeyword.Null;
+        }
+
+        public static StyleEnum<T> GetStyleBoolToEnum<T>(NodeStyle style, StyleProperty<bool> prop, T trueValue, T falseValue) where T : struct, IConvertible
+        {
+            if (style.HasValue(prop)) return style.GetStyleValue<bool>(prop) ? trueValue : falseValue;
+            else return StyleKeyword.Null;
+        }
+
+        public static StyleLength GetStyleBorderRadius(NodeStyle style, StyleProperty<YogaValue2> prop)
+        {
+            if (style.HasValue(prop)) return YogaValueToStyleLength(style.GetStyleValue<YogaValue2>(prop).X);
+            else return StyleKeyword.Null;
+        }
+
+        public static StyleColor GetStyleBorderColor(NodeStyle style, StyleProperty<Color> prop)
+        {
+            if (style.HasValue(prop)) return style.GetStyleValue<Color>(prop);
+            else return StyleKeyword.Null;
+        }
+
+#if UNITY_2022_3_OR_NEWER
         public static StyleBackgroundPosition GetStyleBackgroundPosition(NodeStyle style, ValueListStyleProperty<YogaValue> prop)
         {
             if (style.HasValue(prop))
@@ -164,42 +202,6 @@ Repeat convertRepeat(Types.BackgroundRepeat val)
 
             return new UnityEngine.UIElements.BackgroundRepeat(convertRepeat(valX), convertRepeat(valY));
         }
-
-        public static StyleLength GetStyleLengthDouble(NodeStyle style, StyleProperty<YogaValue> prop, StyleProperty<YogaValue> prop2)
-        {
-            if (style.HasValue(prop)) return YogaValueToStyleLength(style.GetStyleValue<YogaValue>(prop));
-            if (style.HasValue(prop2)) return YogaValueToStyleLength(style.GetStyleValue<YogaValue>(prop2));
-            else return StyleKeyword.Null;
-        }
-
-        public static StyleEnum<T> GetStyleEnum<T>(NodeStyle style, StyleProperty<T> prop) where T : struct, IConvertible
-        {
-            if (style.HasValue(prop)) return style.GetStyleValue<T>(prop);
-            else return StyleKeyword.Null;
-        }
-
-        public static StyleEnum<T> GetStyleEnumCustom<T>(NodeStyle style, IStyleProperty prop) where T : struct, IConvertible
-        {
-            if (style.HasValue(prop)) return style.GetStyleValue<T>(prop);
-            else return StyleKeyword.Null;
-        }
-
-        public static StyleEnum<T> GetStyleBoolToEnum<T>(NodeStyle style, StyleProperty<bool> prop, T trueValue, T falseValue) where T : struct, IConvertible
-        {
-            if (style.HasValue(prop)) return style.GetStyleValue<bool>(prop) ? trueValue : falseValue;
-            else return StyleKeyword.Null;
-        }
-
-        public static StyleLength GetStyleBorderRadius(NodeStyle style, StyleProperty<YogaValue2> prop)
-        {
-            if (style.HasValue(prop)) return YogaValueToStyleLength(style.GetStyleValue<YogaValue2>(prop).X);
-            else return StyleKeyword.Null;
-        }
-
-        public static StyleColor GetStyleBorderColor(NodeStyle style, StyleProperty<Color> prop)
-        {
-            if (style.HasValue(prop)) return style.GetStyleValue<Color>(prop);
-            else return StyleKeyword.Null;
-        }
+#endif
     }
 }