Changed the trackball UI to be more compact

Author: Chman

PostProcessing/Editor/Models/ColorGradingModelEditor.cs

@@ -8,6 +8,7 @@ namespace UnityEditor.PostProcessing
 {
     using Settings = ColorGradingModel.Settings;
     using Tonemapper = ColorGradingModel.Tonemapper;
+	using ColorWheelMode = ColorGradingModel.ColorWheelMode;
 
     [PostProcessingModelEditor(typeof(ColorGradingModel))]
     public class ColorGradingModelEditor : PostProcessingModelEditor
@@ -48,6 +49,7 @@ struct ChannelMixerSettings
 
         struct ColorWheelsSettings
         {
+	        public SerializedProperty mode;
             public SerializedProperty log;
             public SerializedProperty linear;
         }
@@ -138,6 +140,7 @@ public override void OnEnable()
             // Color wheels
             m_ColorWheels = new ColorWheelsSettings
             {
+				mode = FindSetting((Settings x) => x.colorWheels.mode),
                 log = FindSetting((Settings x) => x.colorWheels.log),
                 linear = FindSetting((Settings x) => x.colorWheels.linear)
             };
@@ -400,15 +403,28 @@ void DoChannelMixerGUI()
 
         void DoColorWheelsGUI()
         {
-            EditorGUILayout.Space();
-            EditorGUILayout.PropertyField(m_ColorWheels.linear);
-            var rect = GUILayoutUtility.GetLastRect();
-            WheelSetTitle(rect, "Linear Controls");
-
-            EditorGUILayout.Space();
-            EditorGUILayout.PropertyField(m_ColorWheels.log);
-            rect = GUILayoutUtility.GetLastRect();
-            WheelSetTitle(rect, "Log Controls");
+	        int wheelMode = m_ColorWheels.mode.intValue;
+
+	        using (new EditorGUILayout.HorizontalScope())
+	        {
+		        GUILayout.Space(15);
+		        if (GUILayout.Toggle(wheelMode == (int)ColorWheelMode.Linear, "Linear", EditorStyles.miniButtonLeft)) wheelMode = (int)ColorWheelMode.Linear;
+		        if (GUILayout.Toggle(wheelMode == (int)ColorWheelMode.Log, "Log", EditorStyles.miniButtonRight)) wheelMode = (int)ColorWheelMode.Log;
+	        }
+
+	        m_ColorWheels.mode.intValue = wheelMode;
+	        EditorGUILayout.Space();
+
+	        if (wheelMode == (int)ColorWheelMode.Linear)
+	        {
+		        EditorGUILayout.PropertyField(m_ColorWheels.linear);
+		        WheelSetTitle(GUILayoutUtility.GetLastRect(), "Linear Controls");
+	        }
+			else if (wheelMode == (int)ColorWheelMode.Log)
+			{
+				EditorGUILayout.PropertyField(m_ColorWheels.log);
+				WheelSetTitle(GUILayoutUtility.GetLastRect(), "Log Controls");
+			}
         }
 
         static void WheelSetTitle(Rect position, string label)

PostProcessing/Runtime/Models/ColorGradingModel.cs

@@ -181,9 +181,17 @@ public static LinearWheelsSettings defaultSettings
             }
         }
 
+	    public enum ColorWheelMode
+	    {
+		    Linear,
+			Log
+	    }
+
         [Serializable]
         public struct ColorWheelsSettings
         {
+	        public ColorWheelMode mode;
+
             [TrackballGroup]
             public LogWheelsSettings log;
 
@@ -196,6 +204,7 @@ public static ColorWheelsSettings defaultSettings
                 {
                     return new ColorWheelsSettings
                     {
+						mode = ColorWheelMode.Log,
                         log = LogWheelsSettings.defaultSettings,
                         linear = LinearWheelsSettings.defaultSettings
                     };