Improved volume UI & styling a bit

Author: Chman

PostProcessing/Editor/Effects/ColorGradingEditor.cs

@@ -293,7 +293,7 @@ void DoStandardModeGUI(bool hdr)
 
             using (new EditorGUILayout.HorizontalScope())
             {
-                EditorGUILayout.PrefixLabel("Channel Mixer", GUIStyle.none, Styling.labelHeader);
+                EditorGUILayout.PrefixLabel("Channel Mixer", GUIStyle.none, Styling.headerLabel);
 
                 EditorGUI.BeginChangeCheck();
                 {

PostProcessing/Editor/PostProcessEffectBaseEditor.cs

@@ -132,7 +132,7 @@ protected void PropertyField(SerializedParameterOverride property, GUIContent ti
                         var rect = EditorGUILayout.GetControlRect(false, 24f);
                         rect.y += 8f;
                         rect = EditorGUI.IndentedRect(rect);
-                        EditorGUI.LabelField(rect, (attr as HeaderAttribute).header, Styling.labelHeader);
+                        EditorGUI.LabelField(rect, (attr as HeaderAttribute).header, Styling.headerLabel);
                     }
                 }
             }

PostProcessing/Editor/Utils/EditorUtilities.cs

@@ -139,22 +139,17 @@ public static void DrawSplitter()
             if (Event.current.type != EventType.Repaint)
                 return;
 
-            EditorGUI.DrawRect(rect, !EditorGUIUtility.isProSkin
-                ? new Color(0.6f, 0.6f, 0.6f, 1.333f)
-                : new Color(0.12f, 0.12f, 0.12f, 1.333f));
+            EditorGUI.DrawRect(rect, Styling.splitter);
         }
 
         public static void DrawOverrideCheckbox(Rect rect, SerializedProperty property)
         {
-            var oldColor = GUI.color;
-            GUI.color = new Color(0.6f, 0.6f, 0.6f, 0.75f);
             property.boolValue = GUI.Toggle(rect, property.boolValue, GetContent("|Override this setting for this volume."), Styling.smallTickbox);
-            GUI.color = oldColor;
         }
 
         public static void DrawHeaderLabel(string title)
         {
-            EditorGUILayout.LabelField(title, Styling.labelHeader);
+            EditorGUILayout.LabelField(title, Styling.headerLabel);
         }
 
         public static bool DrawHeader(string title, bool state)
@@ -175,13 +170,12 @@ public static bool DrawHeader(string title, bool state)
             backgroundRect.width += 4f;
 
             // Background
-            float backgroundTint = EditorGUIUtility.isProSkin ? 0.1f : 1f;
-            EditorGUI.DrawRect(backgroundRect, new Color(backgroundTint, backgroundTint, backgroundTint, 0.2f));
+            EditorGUI.DrawRect(backgroundRect, Styling.headerBackground);
 
             // Title
             EditorGUI.LabelField(labelRect, GetContent(title), EditorStyles.boldLabel);
 
-            // Active checkbox
+            // Foldout
             state = GUI.Toggle(foldoutRect, state, GUIContent.none, EditorStyles.foldout);
 
             var e = Event.current;
@@ -203,32 +197,39 @@ public static bool DrawHeader(string title, SerializedProperty group, Serialized
             var backgroundRect = GUILayoutUtility.GetRect(1f, 17f);
 
             var labelRect = backgroundRect;
-            labelRect.xMin += 16f;
+            labelRect.xMin += 32f;
             labelRect.xMax -= 20f;
 
+            var foldoutRect = backgroundRect;
+            foldoutRect.y += 1f;
+            foldoutRect.width = 13f;
+            foldoutRect.height = 13f;
+
             var toggleRect = backgroundRect;
+            toggleRect.x += 16f;
             toggleRect.y += 2f;
             toggleRect.width = 13f;
             toggleRect.height = 13f;
 
-            var menuIcon = EditorGUIUtility.isProSkin
-                ? Styling.paneOptionsIconDark
-                : Styling.paneOptionsIconLight;
-
+            var menuIcon = Styling.paneOptionsIcon;
             var menuRect = new Rect(labelRect.xMax + 4f, labelRect.y + 4f, menuIcon.width, menuIcon.height);
 
             // Background rect should be full-width
             backgroundRect.xMin = 0f;
             backgroundRect.width += 4f;
 
             // Background
-            float backgroundTint = EditorGUIUtility.isProSkin ? 0.1f : 1f;
-            EditorGUI.DrawRect(backgroundRect, new Color(backgroundTint, backgroundTint, backgroundTint, 0.2f));
+            EditorGUI.DrawRect(backgroundRect, Styling.headerBackground);
 
             // Title
             using (new EditorGUI.DisabledScope(!activeField.boolValue))
                 EditorGUI.LabelField(labelRect, GetContent(title), EditorStyles.boldLabel);
 
+            // foldout
+            group.serializedObject.Update();
+            group.isExpanded = GUI.Toggle(foldoutRect, group.isExpanded, GUIContent.none, EditorStyles.foldout);
+            group.serializedObject.ApplyModifiedProperties();
+
             // Active checkbox
             activeField.serializedObject.Update();
             activeField.boolValue = GUI.Toggle(toggleRect, activeField.boolValue, GUIContent.none, Styling.smallTickbox);

PostProcessing/Editor/Utils/Styling.cs

@@ -7,11 +7,20 @@ public static class Styling
     {
         public static readonly GUIStyle smallTickbox;
         public static readonly GUIStyle miniLabelButton;
+        
+        static readonly Color splitterDark;
+        static readonly Color splitterLight;
+        public static Color splitter { get { return EditorGUIUtility.isProSkin ? splitterDark : splitterLight; } }
 
-        public static readonly Texture2D paneOptionsIconDark;
-        public static readonly Texture2D paneOptionsIconLight;
+        static readonly Texture2D paneOptionsIconDark;
+        static readonly Texture2D paneOptionsIconLight;
+        public static Texture2D paneOptionsIcon { get { return EditorGUIUtility.isProSkin ? paneOptionsIconDark : paneOptionsIconLight; } }
 
-        public static readonly GUIStyle labelHeader;
+        public static readonly GUIStyle headerLabel;
+
+        static readonly Color headerBackgroundDark;
+        static readonly Color headerBackgroundLight;
+        public static Color headerBackground { get { return EditorGUIUtility.isProSkin ? headerBackgroundDark : headerBackgroundLight; } }
 
         public static readonly GUIStyle wheelLabel;
         public static readonly GUIStyle wheelThumb;
@@ -21,7 +30,7 @@ public static class Styling
 
         static Styling()
         {
-            smallTickbox = new GUIStyle("ShurikenCheckMark");
+            smallTickbox = new GUIStyle("ShurikenToggle");
 
             miniLabelButton = new GUIStyle(EditorStyles.miniLabel);
             miniLabelButton.normal = new GUIStyleState
@@ -40,10 +49,16 @@ static Styling()
             miniLabelButton.onNormal = activeState;
             miniLabelButton.onActive = activeState;
 
+            splitterDark = new Color(0.12f, 0.12f, 0.12f, 1.333f);
+            splitterLight = new Color(0.6f, 0.6f, 0.6f, 1.333f);
+            
+            headerBackgroundDark = new Color(0.1f, 0.1f, 0.1f, 0.2f);
+            headerBackgroundLight = new Color(1f, 1f, 1f, 0.2f);
+
             paneOptionsIconDark = (Texture2D)EditorGUIUtility.Load("Builtin Skins/DarkSkin/Images/pane options.png");
             paneOptionsIconLight = (Texture2D)EditorGUIUtility.Load("Builtin Skins/LightSkin/Images/pane options.png");
 
-            labelHeader = new GUIStyle(EditorStyles.miniLabel);
+            headerLabel = new GUIStyle(EditorStyles.miniLabel);
 
             wheelThumb = new GUIStyle("ColorPicker2DThumb");