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

Version 0.0.31
techno-dwarf-works · Aug 2, 2024 · 762ab7c · 762ab7c
2 parents a2132ce + 801ce2f
commit 762ab7c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/Assets/BetterCommons/Editor/Drawers/BehavioredElements/DefaultElementBehaviour.cs b/Assets/BetterCommons/Editor/Drawers/BehavioredElements/DefaultElementBehaviour.cs
@@ -7,7 +7,7 @@ namespace Better.Commons.EditorAddons.Drawers.BehavioredElements
     public class DefaultElementBehaviour<TElement> : IElementBehaviour<TElement> where TElement : VisualElement, new()
     {
         protected BehavioredElement<TElement> BehavioredElement { get; private set; }
-        
+
         public virtual void OnLink(BehavioredElement<TElement> behavioredElement)
         {
             BehavioredElement = behavioredElement;
@@ -19,20 +19,23 @@ public virtual void OnLink(BehavioredElement<TElement> behavioredElement)
                 .MarginTop(zeroLength)
                 .Width(new StyleLength(new Length(100, LengthUnit.Percent)));
         }
-        
+
         public virtual void OnAttach(VisualElement root)
         {
             if (root is not Label label)
             {
                 label = root.Q<Label>();
             }
 
+            var labelParent = label?.parent;
+            if (labelParent == null) return;
+            if (labelParent.Contains(BehavioredElement)) return;
+
             BehavioredElement.RemoveFromHierarchy();
             label.style
                 .Width(StyleDefinition.LabelWidthStyle)
                 .FlexGrow(new StyleFloat(1f));
-
-            var labelParent = label.parent;
+
             labelParent.style.FlexDirection(new StyleEnum<FlexDirection>(FlexDirection.Row));
             labelParent.Add(BehavioredElement);
 

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