Merge pull request #64 from techno-dwarf-works/feature/refactoring

Version 0.0.61
techno-dwarf-works · Dec 14, 2024 · 7360728 · 7360728
1 parent 85a503a
commit 7360728
Show file tree

Hide file tree

Showing 2 changed files with 64 additions and 2 deletions.
diff --git a/Editor/Helpers/StyleContainer.cs b/Editor/Helpers/StyleContainer.cs
@@ -91,6 +91,11 @@ public class StyleContainer : IStyle
         private StyleProperty<StyleFloat> _unitySliceScale;
 #endif
 
+#if UNITY_6000_0_OR_NEWER
+        private StyleProperty<StyleEnum<TextGeneratorType>> _unityTextGenerator;
+        private StyleProperty<StyleEnum<EditorTextRenderingMode>> _unityEditorTextRenderingMode;
+#endif
+
         private IStyle _cachedStyle;
 
         public StyleEnum<Align> alignContent
@@ -1632,7 +1637,6 @@ public StyleEnum<TextAnchor> unityTextAlign
                 _unityTextAlign.Value = value;
             }
         }
-
         public StyleColor unityTextOutlineColor
         {
             get
@@ -1899,6 +1903,52 @@ public StyleFloat unitySliceScale
         }
 #endif
 
+#if UNITY_6000_0_OR_NEWER
+        public StyleEnum<TextGeneratorType> unityTextGenerator
+        {
+            get
+            {
+                if (_unitySliceScale.HasValue || _cachedStyle == null)
+                {
+                    return _unityTextGenerator.Value;
+                }
+
+                return _cachedStyle.unityTextGenerator;
+            }
+            set
+            {
+                if (_cachedStyle != null)
+                {
+                    _cachedStyle.unityTextGenerator = value;
+                }
+
+                _unityTextGenerator.Value = value;
+            }
+        }
+
+        public StyleEnum<EditorTextRenderingMode> unityEditorTextRenderingMode
+        {
+            get
+            {
+                if (_unitySliceScale.HasValue || _cachedStyle == null)
+                {
+                    return _unityEditorTextRenderingMode.Value;
+                }
+
+                return _cachedStyle.unityEditorTextRenderingMode;
+            }
+            set
+            {
+                if (_cachedStyle != null)
+                {
+                    _cachedStyle.unityEditorTextRenderingMode = value;
+                }
+
+                _unityEditorTextRenderingMode.Value = value;
+            }
+        }
+#endif
+
         public void Setup(IStyle style)
         {
             //TODO: Add validation for style
@@ -2324,6 +2374,18 @@ private void ForceApply()
                 _cachedStyle.unitySliceScale = _unitySliceScale.Value;
             }
 #endif
+
+#if UNITY_6000_0_OR_NEWER
+            if (_unityTextGenerator.HasValue)
+            {
+                _cachedStyle.unityTextGenerator = _unityTextGenerator.Value;
+            }
+
+            if (_unityEditorTextRenderingMode.HasValue)
+            {
+                _cachedStyle.unityEditorTextRenderingMode = _unityEditorTextRenderingMode.Value;
+            }
+#endif
         }
     }
 }
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "com.tdw.better.commons",
   "displayName": "Better Commons",
-  "version": "0.0.60",
+  "version": "0.0.61",
   "unity": "2021.3",
   "description": " ",
   "dependencies": {