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

Version 0.0.30
techno-dwarf-works · Aug 1, 2024 · 4e47dce · 4e47dce
1 parent 96c69d4
commit 4e47dce
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 73 deletions.
diff --git a/Editor/Drawers/BehavioredElements/GizmoElementBehaviour.cs b/Editor/Drawers/BehavioredElements/GizmoElementBehaviour.cs
diff --git a/Editor/Drawers/BehavioredElements/GizmoElementBehaviour.cs.meta b/Editor/Drawers/BehavioredElements/GizmoElementBehaviour.cs.meta
diff --git a/Editor/Drawers/BehavioredElements/SelectElementBehaviour.cs b/Editor/Drawers/BehavioredElements/SelectElementBehaviour.cs
diff --git a/Editor/Drawers/BehavioredElements/SelectElementBehaviour.cs.meta b/Editor/Drawers/BehavioredElements/SelectElementBehaviour.cs.meta
diff --git a/Editor/Drawers/Container/ElementsContainer.cs b/Editor/Drawers/Container/ElementsContainer.cs
@@ -12,9 +12,6 @@ namespace Better.Commons.EditorAddons.Drawers.Container
 {
     public class ElementsContainer
     {
-        private long _updateInterval = 5024;
-        private IVisualElementScheduledItem _updateSchedule;
-
         public VisualElement RootElement { get; set; }
         public PrewarmElement CoreElement { get; }
         public bool Used { get; private set; }
@@ -26,16 +23,6 @@ public class ElementsContainer
         public event Action<ElementsContainer> SerializedObjectChanged;
         public event Action<ElementsContainer> SerializedPropertyChanged;
 
-        public long UpdateInterval
-        {
-            get => _updateInterval;
-            set
-            {
-                _updateInterval = Math.Max(value, 100);
-                _updateSchedule.Every(_updateInterval);
-            }
-        }
-
         public ElementsContainer(SerializedProperty serializedProperty)
         {
             Used = false;

diff --git a/Editor/Extensions/VisualElementExtension.cs b/Editor/Extensions/VisualElementExtension.cs
@@ -9,11 +9,11 @@ namespace Better.Commons.EditorAddons.Extensions
 {
     public static class VisualElementExtension
     {
-        public static void OnElementAppear<TElement>(this VisualElement self, Action<TElement> action) where TElement : VisualElement
+        public static IVisualElementScheduledItem OnElementAppear<TElement>(this VisualElement self, Action<TElement> action) where TElement : VisualElement
         {
-            self.OnElementAppear(self, action);
+            return self.OnElementAppear(self, action);
         }
-        
+
         public static void AddClickedEvent(this VisualElement self, SerializedProperty property, EventCallback<ClickEvent, SerializedProperty> action)
         {
             self.RegisterCallback(action, property);
@@ -38,7 +38,7 @@ public static Image AddIcon(this VisualElement self, IconType iconType)
             self.Insert(0, image);
             return image;
         }
-        
+
         public static Image AddIcon(this VisualElement self, Texture texture)
         {
             var image = VisualElementUtility.CreateLabelIcon(texture);

diff --git a/Editor/Extensions/VisualElementSchedulerExtension.cs b/Editor/Extensions/VisualElementSchedulerExtension.cs
@@ -6,28 +6,30 @@ namespace Better.Commons.EditorAddons.Extensions
 {
     public static class VisualElementSchedulerExtension
     {
-        public static void OnElementAppear<TElement>(this IVisualElementScheduler self, VisualElement element, Action<TElement> action) 
+        public static IVisualElementScheduledItem OnElementAppear<TElement>(this IVisualElementScheduler self, VisualElement element, Action<TElement> action)
             where TElement : VisualElement
         {
             if (self == null)
             {
-                DebugUtility.LogException<ArgumentNullException>(nameof(self));
-                return;
+                throw new ArgumentNullException(nameof(self));
             }
 
             if (action == null)
             {
-                DebugUtility.LogException<ArgumentNullException>(nameof(action));
-                return;
+                throw new ArgumentNullException(nameof(action));
             }
 
-            self.Execute(OnExecute).Until(() => element.Q<TElement>() != null);
-            return;
+
+            return self.Execute(OnExecute).Until(() => element.Q<TElement>() != null);
 
             void OnExecute()
             {
                 var queriedElement = element.Q<TElement>();
-                if(queriedElement == null) return;
+                if (queriedElement == null)
+                {
+                    return;
+                }
+
                 action.Invoke(queriedElement);
             }
         }

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "com.tdw.better.commons",
   "displayName": "Better Commons",
-  "version": "0.0.29",
+  "version": "0.0.30",
   "unity": "2021.3",
   "description": " ",
   "dependencies": {