Remove illegal scene tool activation buttons from inspectors, replace with helpboxes

Author: glabute

com.unity.cinemachine/Editor/Editors/CinemachineSplineDollyLookAtTargetsEditor.cs

@@ -83,17 +83,23 @@ public override VisualElement CreateInspectorGUI()
                 HelpBoxMessageType.Warning);
             ux.Add(invalidHelp);
 
-            var tooltip = "Use the Scene View tool to Edit the LookAt targets on the spline";
-            var buttonRow = ux.AddChild(new InspectorUtility.LabeledRow("Edit in Scene View", tooltip));
-            var toolButton = buttonRow.Contents.AddChild(
-                CinemachineSceneToolHelpers.CreateSceneToolActivationButtonForInspector(
-                    typeof(LookAtDataOnSplineTool), target, LookAtDataOnSplineTool.IconPath, tooltip));
+            var toolHelp = ux.AddChild(new HelpBox(
+                "Use the Scene View tool to Edit the LookAt targets on the spline", HelpBoxMessageType.Info));
+            toolHelp.OnInitialGeometry(() =>
+            {
+                var icon = toolHelp.Q(className: "unity-help-box__icon");
+                if (icon != null)
+                {
+                    icon.style.backgroundImage = AssetDatabase.LoadAssetAtPath<Texture2D>(LookAtDataOnSplineTool.IconPath);
+                    icon.style.marginRight = 12;
+                }
+            });
+            ux.AddSpace();
 
             ux.TrackAnyUserActivity(() =>
             {
                 var haveSpline = splineData != null && splineData.GetGetSplineAndDolly(out _, out _);
                 invalidHelp.SetVisible(!haveSpline);
-                toolButton.SetEnabled(haveSpline);
             });
 
             var targetsProp = serializedObject.FindProperty(() => splineData.Targets);

com.unity.cinemachine/Editor/Editors/CinemachineSplineRollEditor.cs

@@ -22,17 +22,23 @@ public override VisualElement CreateInspectorGUI()
                 HelpBoxMessageType.Warning);
             ux.Add(invalidHelp);
 
-            var tooltip = "Use the Scene View tool to adjust the roll data points";
-            var buttonRow = ux.AddChild(new InspectorUtility.LabeledRow("Edit in Scene View", tooltip));
-            var toolButton = buttonRow.Contents.AddChild(
-                CinemachineSceneToolHelpers.CreateSceneToolActivationButtonForInspector(
-                    typeof(SplineRollTool), target, SplineRollTool.IconPath, tooltip));
+            var toolHelp = ux.AddChild(new HelpBox(
+                "Use the Scene View tool to adjust the roll data points", HelpBoxMessageType.Info));
+            toolHelp.OnInitialGeometry(() =>
+            {
+                var icon = toolHelp.Q(className: "unity-help-box__icon");
+                if (icon != null)
+                {
+                    icon.style.backgroundImage = AssetDatabase.LoadAssetAtPath<Texture2D>(SplineRollTool.IconPath);
+                    icon.style.marginRight = 12;
+                }
+            });
+            ux.AddSpace();
 
             ux.TrackAnyUserActivity(() =>
             {
                 var haveSpline = splineData != null && splineData.SplineContainer != null;
                 invalidHelp.SetVisible(!haveSpline);
-                toolButton.SetEnabled(haveSpline);
             });
 
             var rollProp = serializedObject.FindProperty(() => splineData.Roll);

com.unity.cinemachine/Editor/Utility/CinemachineSceneToolHelpers.cs

@@ -29,41 +29,6 @@ static class CinemachineSceneToolHelpers
 
         static Color s_NormalBkgColor = Color.black;
 
-        /// <summary>Create a button for the inspector that activates a scene tool</summary>
-        public static VisualElement CreateSceneToolActivationButtonForInspector(
-            Type toolType, UnityEngine.Object target, string iconPath, string tooltip)
-        {
-            var toolButton = new Button(() => 
-            {
-                if (Selection.activeObject != target)
-                    Selection.activeObject = target;
-                EditorApplication.delayCall += () => ToolManager.SetActiveTool(toolType);
-            })
-            { 
-                tooltip = tooltip,
-                style = 
-                { 
-                    flexGrow = 0,
-                    flexBasis = 2 * InspectorUtility.SingleLineHeight,
-                    height = InspectorUtility.SingleLineHeight + 3,
-                },
-            };
-            toolButton.Add(new Image { image = AssetDatabase.LoadAssetAtPath<Texture2D>(iconPath) });
-
-            // Capture "normal" colors
-            if (s_NormalBkgColor == Color.black)
-                toolButton.OnInitialGeometry(() => s_NormalBkgColor = toolButton.resolvedStyle.backgroundColor);
-
-            toolButton.ContinuousUpdate(() => 
-            {
-                if (ToolManager.activeToolType == toolType)
-                    toolButton.style.backgroundColor = Color.Lerp(s_NormalBkgColor, new Color(0.1f, 0.3f, 0.6f, 1), 0.5f);
-                else
-                    toolButton.style.backgroundColor = s_NormalBkgColor;
-            });
-            return toolButton;
-        }
-
         public static float SliderHandleDelta(Vector3 newPos, Vector3 oldPos, Vector3 forward)
         {
             var delta = newPos - oldPos;