Reimplement LabelWidthAttribute & Drawer as a Toolbox decorator

Author: arimger

Assets/Editor Toolbox/Editor/Drawers/Regular/LabelWidthAttributeDrawer.cs

@@ -7,28 +7,13 @@ namespace Toolbox.Editor.Drawers
 {
     public class LabelAttributeDrawer : ToolboxDecoratorDrawer<LabelAttribute>
     {
-        protected override void OnGuiBeginSafe(LabelAttribute attribute)
+        private static GUIStyle GetLabelStyle(FontStyle style)
         {
-            //prepare proper styles for the scope and text
-            var scopeStyle = GetScopeStyle(attribute.SkinStyle);
-            var labelStyle = GetLabelStyle(attribute.FontStyle);
-
-            GUILayout.Space(attribute.SpaceBefore);
-            //create (optionally) the vertical scope group
-            using (CreateScopeIfNeeded(scopeStyle))
+            switch (style)
             {
-                labelStyle.alignment = attribute.Alignment;
-                labelStyle.fontStyle = attribute.FontStyle;
-                EditorGUILayout.LabelField(GetContent(attribute), labelStyle);
+                default:
+                    return Style.labelStyle;
             }
-
-            GUILayout.Space(attribute.SpaceAfter);
-        }
-
-
-        private static GUIStyle GetLabelStyle(FontStyle style)
-        {
-            return Style.labelStyle;
         }
 
         private static GUIStyle GetScopeStyle(SkinStyle style)
@@ -41,9 +26,9 @@ private static GUIStyle GetScopeStyle(SkinStyle style)
                     return Style.boxedScopeStyle;
                 case SkinStyle.Round:
                     return Style.roundScopeStyle;
+                default:
+                    return Style.labelScopeStyle;
             }
-
-            return Style.labelScopeStyle;
         }
 
         private static GUIContent GetContent(LabelAttribute attribute)
@@ -72,6 +57,23 @@ private static IDisposable CreateScopeIfNeeded(GUIStyle style)
             return style != null ? new EditorGUILayout.VerticalScope(style) : null;
         }
 
+        protected override void OnGuiBeginSafe(LabelAttribute attribute)
+        {
+            //prepare proper styles for the scope and text
+            var scopeStyle = GetScopeStyle(attribute.SkinStyle);
+            var labelStyle = GetLabelStyle(attribute.FontStyle);
+
+            GUILayout.Space(attribute.SpaceBefore);
+            //create (optionally) the vertical scope group
+            using (CreateScopeIfNeeded(scopeStyle))
+            {
+                labelStyle.alignment = attribute.Alignment;
+                labelStyle.fontStyle = attribute.FontStyle;
+                EditorGUILayout.LabelField(GetContent(attribute), labelStyle);
+            }
+
+            GUILayout.Space(attribute.SpaceAfter);
+        }
 
         private static class Style
         {

Assets/Editor Toolbox/Editor/Drawers/Toolbox/Decorator/LabelAttributeDrawer.cs

@@ -0,0 +1,23 @@
+using UnityEditor;
+using UnityEngine;
+
+namespace Toolbox.Editor.Drawers
+{
+    public class LabelWidthAttributeDrawer : ToolboxDecoratorDrawer<LabelWidthAttribute>
+    {
+        private float widthToRestore;
+
+        protected override void OnGuiBeginSafe(LabelWidthAttribute attribute)
+        {
+            base.OnGuiBeginSafe(attribute);
+            widthToRestore = EditorGUIUtility.labelWidth;
+            EditorGUIUtility.labelWidth = attribute.Width;
+        }
+
+        protected override void OnGuiCloseSafe(LabelWidthAttribute attribute)
+        {
+            EditorGUIUtility.labelWidth = widthToRestore;
+            base.OnGuiCloseSafe(attribute);
+        }
+    }
+}

Assets/Editor Toolbox/Editor/Drawers/Toolbox/Decorator/LabelWidthAttributeDrawer.cs

@@ -10,7 +10,7 @@ namespace UnityEngine
     /// </summary>
     [AttributeUsage(AttributeTargets.Field, AllowMultiple = false)]
     [Conditional("UNITY_EDITOR")]
-    public class LabelWidthAttribute : PropertyAttribute
+    public class LabelWidthAttribute : ToolboxDecoratorAttribute
     {
         public LabelWidthAttribute(float width = 120)
         {

Assets/Editor Toolbox/Editor/Drawers/Regular/LabelWidthAttributeDrawer.cs.meta renamed to Assets/Editor Toolbox/Editor/Drawers/Toolbox/Decorator/LabelWidthAttributeDrawer.cs.meta

@@ -113,9 +113,4 @@ public enum FlagExample
     public int bigNumber;
     [FormattedNumber("c")]
     public float currency;
-
-    [Label("Label Width", skinStyle: SkinStyle.Box)]
-
-    [LabelWidth(220.0f)]
-    public int veryVeryVeryVeryVeryLongName;
 }

Assets/Editor Toolbox/Runtime/Attributes/Property/Regular/LabelWidthAttribute.cs

@@ -121,6 +121,11 @@ private static void TestStaticMethod()
     [GuiColor(1, 0, 0)]
     public int var56;
 
+    [Label("Label Width", skinStyle: SkinStyle.Box)]
+
+    [LabelWidth(220.0f)]
+    public int veryVeryVeryVeryVeryLongName;
+
     [Label("Title", skinStyle: SkinStyle.Box)]
 
     [Title("Standard Title")]