Skip to content

Commit 7aa0dde

Browse files
svc-reach-platform-supportEvergreen
authored andcommitted
[Port] [6000.3] [UUM-132809] Fix naming in add component menu and GameObject creation menu for ugui shadergraph samples
1 parent d1f07f8 commit 7aa0dde

7 files changed

Lines changed: 12 additions & 12 deletions

File tree

Packages/com.unity.shadergraph/Samples~/UGUIShaders/Scripts/Runtime/CustomButton.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ namespace Unity.UI.Shaders.Sample
1717
/// <see cref="Selectable.DoStateTransition(Selectable.SelectionState, bool)"/> is called.
1818
/// <para>Implemented as a <see cref="Selectable"/>.</para>
1919
/// </summary>
20-
[AddComponentMenu("UI/ShaderGraph Samples/Button")]
20+
[AddComponentMenu("UI (Canvas)/ShaderGraph Samples/Button")]
2121
public class CustomButton : Selectable, IPointerClickHandler, ISubmitHandler /*Button*/, IMaterialModifier
2222
{
2323
public UnityEvent onClick;
@@ -105,7 +105,7 @@ public virtual Material GetModifiedMaterial(Material baseMaterial)
105105
}
106106

107107
#if UNITY_EDITOR
108-
[MenuItem("GameObject/UI/ShaderGraph Samples/Button", false, 30)]
108+
[MenuItem("GameObject/UI (Canvas)/ShaderGraph Samples/Button", false, 30)]
109109
static void CreateButtonGameObject(MenuCommand command)
110110
{
111111
GameObject go = ObjectFactory.CreateGameObject("SG Button", new Type[] { typeof(RectTransform), typeof(CanvasRenderer), typeof(Image), typeof(CustomButton) });

Packages/com.unity.shadergraph/Samples~/UGUIShaders/Scripts/Runtime/CustomSlider.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ namespace Unity.UI.Shaders.Sample
1515
/// A custom Slider.
1616
/// <para>Unlike a <see cref="Slider"/>, this uses only a single RectTransform.</para>
1717
/// </summary>
18-
[AddComponentMenu("UI/ShaderGraph Samples/Slider")]
18+
[AddComponentMenu("UI (Canvas)/ShaderGraph Samples/Slider")]
1919
[RequireComponent(typeof(Graphic))]
2020
[DisallowMultipleComponent]
2121
public class CustomSlider : Selectable, IDragHandler, IInitializePotentialDragHandler, IMaterialModifier
@@ -288,7 +288,7 @@ public virtual void OnInitializePotentialDrag(PointerEventData eventData)
288288
}
289289

290290
#if UNITY_EDITOR
291-
[MenuItem("GameObject/UI/ShaderGraph Samples/Slider", false, 30)]
291+
[MenuItem("GameObject/UI (Canvas)/ShaderGraph Samples/Slider", false, 30)]
292292
static void CreateToggleGameObject(MenuCommand command)
293293
{
294294
GameObject go = ObjectFactory.CreateGameObject("Slider", new Type[] { typeof(RectTransform), typeof(CanvasRenderer), typeof(Image), typeof(RectTransformSize), typeof(CustomSlider) });

Packages/com.unity.shadergraph/Samples~/UGUIShaders/Scripts/Runtime/CustomToggle.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ namespace Unity.UI.Shaders.Sample
1717
/// <see cref="Toggle.isOn"/> changes.
1818
/// <para>Implemented as a variant of <see cref="Toggle"/> to make it work nicely with <see cref="ToggleGroup"/>.</para>
1919
/// </summary>
20-
[AddComponentMenu("UI/ShaderGraph Samples/Toggle")]
20+
[AddComponentMenu("UI (Canvas)/ShaderGraph Samples/Toggle")]
2121
[RequireComponent(typeof(Graphic))]
2222
public class CustomToggle : Toggle, IMaterialModifier
2323
{
@@ -129,7 +129,7 @@ public override void OnSubmit(BaseEventData eventData)
129129
}
130130

131131
#if UNITY_EDITOR
132-
[MenuItem("GameObject/UI/ShaderGraph Samples/Toggle", false, 30)]
132+
[MenuItem("GameObject/UI (Canvas)/ShaderGraph Samples/Toggle", false, 30)]
133133
static void CreateToggleGameObject(MenuCommand command)
134134
{
135135
GameObject go = ObjectFactory.CreateGameObject("SG Toggle", new Type[] { typeof(RectTransform), typeof(CanvasRenderer), typeof(Image), typeof(CustomToggle) });

Packages/com.unity.shadergraph/Samples~/UGUIShaders/Scripts/Runtime/GraphicColor.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ namespace Unity.UI.Shaders.Sample
77
/// <summary>
88
///
99
/// </summary>
10-
[AddComponentMenu("UI/ShaderGraph Samples/Graphic Color")]
10+
[AddComponentMenu("UI (Canvas)/ShaderGraph Samples/Graphic Color")]
1111
[RequireComponent(typeof(Graphic))]
1212
public class GraphicColor : UIBehaviour
1313
{

Packages/com.unity.shadergraph/Samples~/UGUIShaders/Scripts/Runtime/Meter.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ namespace Unity.UI.Shaders.Sample
1212
/// <summary>
1313
/// A simple Meter.
1414
/// </summary>
15-
[AddComponentMenu("UI/ShaderGraph Samples/Meter")]
15+
[AddComponentMenu("UI (Canvas)/ShaderGraph Samples/Meter")]
1616
[RequireComponent(typeof(Graphic))]
1717
[DisallowMultipleComponent]
1818
public class Meter : UIBehaviour, IMaterialModifier
@@ -108,7 +108,7 @@ public virtual Material GetModifiedMaterial(Material baseMaterial)
108108
}
109109

110110
#if UNITY_EDITOR
111-
[MenuItem("GameObject/UI/ShaderGraph Samples/Meter", false, 30)]
111+
[MenuItem("GameObject/UI (Canvas)/ShaderGraph Samples/Meter", false, 30)]
112112
static void CreateToggleGameObject(MenuCommand command)
113113
{
114114
GameObject go = ObjectFactory.CreateGameObject("Meter", new System.Type[] { typeof(RectTransform), typeof(CanvasRenderer), typeof(Image), typeof(RectTransformSize), typeof(Meter) });

Packages/com.unity.shadergraph/Samples~/UGUIShaders/Scripts/Runtime/RangeBar.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ namespace Unity.UI.Shaders.Sample
1313
/// A simple ProgressBar.
1414
/// <para>Becomes interactable when associated with a <see cref="CustomSlider"/></para>
1515
/// </summary>
16-
[AddComponentMenu("UI/ShaderGraph Samples/Range Bar")]
16+
[AddComponentMenu("UI (Canvas)/ShaderGraph Samples/Range Bar")]
1717
[RequireComponent(typeof(Graphic))]
1818
[DisallowMultipleComponent]
1919
public class RangeBar : UIBehaviour, IMaterialModifier
@@ -137,7 +137,7 @@ public virtual Material GetModifiedMaterial(Material baseMaterial)
137137
}
138138

139139
#if UNITY_EDITOR
140-
[MenuItem("GameObject/UI/ShaderGraph Samples/Range Bar", false, 30)]
140+
[MenuItem("GameObject/UI (Canvas)/ShaderGraph Samples/Range Bar", false, 30)]
141141
static void CreateToggleGameObject(MenuCommand command)
142142
{
143143
GameObject go = ObjectFactory.CreateGameObject("Range Bar", new System.Type[] { typeof(RectTransform), typeof(CanvasRenderer), typeof(Image), typeof(RectTransformSize), typeof(RangeBar) });

Packages/com.unity.shadergraph/Samples~/UGUIShaders/Scripts/Runtime/RectTransformSize.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ namespace Unity.UI.Shaders.Sample
77
/// <summary>
88
/// Sets the UI Material's Property to the <see cref="UnityEngine.RectTransform"/>'s screen size.
99
/// </summary>
10-
[AddComponentMenu("UI/ShaderGraph Samples/RectTransform Size")]
10+
[AddComponentMenu("UI (Canvas)/ShaderGraph Samples/RectTransform Size")]
1111
[ExecuteAlways]
1212
[RequireComponent(typeof(RectTransform), typeof(Graphic))]
1313
[DisallowMultipleComponent]

0 commit comments

Comments
 (0)