Updated Editor menu layout

pull/413/head
Simon Jackson 2023-01-01 11:45:02 +00:00
parent 2c5a7bb47f
commit 55489bd617
1 changed files with 142 additions and 143 deletions

View File

@ -214,13 +214,13 @@ namespace UnityEditor.UI
// since there's no point in that, and it's good to keep them as consistent as possible. // since there's no point in that, and it's good to keep them as consistent as possible.
lbl.color = s_TextColor; lbl.color = s_TextColor;
} }
#endregion #endregion
#endregion #endregion
#region UI Extensions "Create" Menu items #region UI Extensions "Create" Menu items
#region Scroll Snap controls #region Scroll Snap controls
[MenuItem("GameObject/UI/Extensions/Horizontal Scroll Snap", false)] [MenuItem("GameObject/UI/Extensions/Layout/Horizontal Scroll Snap", false)]
static public void AddHorizontalScrollSnap(MenuCommand menuCommand) static public void AddHorizontalScrollSnap(MenuCommand menuCommand)
{ {
GameObject horizontalScrollSnapRoot = CreateUIElementRoot("Horizontal Scroll Snap", menuCommand, s_ThickGUIElementSize); GameObject horizontalScrollSnapRoot = CreateUIElementRoot("Horizontal Scroll Snap", menuCommand, s_ThickGUIElementSize);
@ -285,7 +285,7 @@ namespace UnityEditor.UI
Selection.activeGameObject = horizontalScrollSnapRoot; Selection.activeGameObject = horizontalScrollSnapRoot;
} }
[MenuItem("GameObject/UI/Extensions/Vertical Scroll Snap", false)] [MenuItem("GameObject/UI/Extensions/Layout/Vertical Scroll Snap", false)]
static public void AddVerticallScrollSnap(MenuCommand menuCommand) static public void AddVerticallScrollSnap(MenuCommand menuCommand)
{ {
GameObject verticalScrollSnapRoot = CreateUIElementRoot("Vertical Scroll Snap", menuCommand, s_ThickGUIElementSize); GameObject verticalScrollSnapRoot = CreateUIElementRoot("Vertical Scroll Snap", menuCommand, s_ThickGUIElementSize);
@ -357,7 +357,7 @@ namespace UnityEditor.UI
Selection.activeGameObject = verticalScrollSnapRoot; Selection.activeGameObject = verticalScrollSnapRoot;
} }
#region New ScrollSnapCode #region New ScrollSnapCode
static public void FixedScrollSnapBase(MenuCommand menuCommand, string name, ScrollSnap.ScrollDirection direction, int itemVisible, int itemCount, Vector2 itemSize) static public void FixedScrollSnapBase(MenuCommand menuCommand, string name, ScrollSnap.ScrollDirection direction, int itemVisible, int itemCount, Vector2 itemSize)
{ {
GameObject scrollSnapRoot = CreateUIElementRoot(name, menuCommand, s_ThickGUIElementSize); GameObject scrollSnapRoot = CreateUIElementRoot(name, menuCommand, s_ThickGUIElementSize);
@ -479,10 +479,10 @@ namespace UnityEditor.UI
{ {
FixedScrollSnapBase(menuCommand, "Scroll Snap Vertical Multiple", ScrollSnap.ScrollDirection.Vertical, 3, 15, new Vector2(100, 100)); FixedScrollSnapBase(menuCommand, "Scroll Snap Vertical Multiple", ScrollSnap.ScrollDirection.Vertical, 3, 15, new Vector2(100, 100));
} }
#endregion #endregion
#region ContentScrollSnapHorizontal #region ContentScrollSnapHorizontal
[MenuItem("GameObject/UI/Extensions/Content Scroll Snap Horizontal", false)] [MenuItem("GameObject/UI/Extensions/Layout/Content Scroll Snap Horizontal", false)]
static public void AddContentScrollSnapHorizontal(MenuCommand menuCommand) static public void AddContentScrollSnapHorizontal(MenuCommand menuCommand)
{ {
GameObject contentScrollSnapRoot = CreateUIElementRoot("Content Scroll Snap Horizontal", menuCommand, s_ThickGUIElementSize); GameObject contentScrollSnapRoot = CreateUIElementRoot("Content Scroll Snap Horizontal", menuCommand, s_ThickGUIElementSize);
@ -586,12 +586,12 @@ namespace UnityEditor.UI
//add scroll snap after we've added the content & items //add scroll snap after we've added the content & items
contentScrollSnapRoot.AddComponent<ContentScrollSnapHorizontal>(); contentScrollSnapRoot.AddComponent<ContentScrollSnapHorizontal>();
} }
#endregion #endregion
#endregion #endregion
#region UIVertical Scroller #region UIVertical Scroller
[MenuItem("GameObject/UI/Extensions/UI Vertical Scroller", false)] [MenuItem("GameObject/UI/Extensions/Layout/UI Vertical Scroller", false)]
static public void AddUIVerticallScroller(MenuCommand menuCommand) static public void AddUIVerticallScroller(MenuCommand menuCommand)
{ {
GameObject uiVerticalScrollerRoot = CreateUIElementRoot("UI Vertical Scroller", menuCommand, s_ThickGUIElementSize); GameObject uiVerticalScrollerRoot = CreateUIElementRoot("UI Vertical Scroller", menuCommand, s_ThickGUIElementSize);
@ -669,10 +669,10 @@ namespace UnityEditor.UI
Selection.activeGameObject = uiVerticalScrollerRoot; Selection.activeGameObject = uiVerticalScrollerRoot;
} }
#endregion #endregion
#region UI Button #region UI Button
[MenuItem("GameObject/UI/Extensions/UI Button", false)] [MenuItem("GameObject/UI/Extensions/Controls/UI Button", false)]
static public void AddUIButton(MenuCommand menuCommand) static public void AddUIButton(MenuCommand menuCommand)
{ {
GameObject uiButtonRoot = CreateUIElementRoot("UI Button", menuCommand, s_ThickGUIElementSize); GameObject uiButtonRoot = CreateUIElementRoot("UI Button", menuCommand, s_ThickGUIElementSize);
@ -699,10 +699,10 @@ namespace UnityEditor.UI
Selection.activeGameObject = uiButtonRoot; Selection.activeGameObject = uiButtonRoot;
} }
#endregion #endregion
#region UI Flippable #region UI Flippable
[MenuItem("GameObject/UI/Extensions/UI Flippable", false)] [MenuItem("GameObject/UI/Extensions/Controls/UI Flippable", false)]
static public void AddUIFlippableImage(MenuCommand menuCommand) static public void AddUIFlippableImage(MenuCommand menuCommand)
{ {
GameObject go = CreateUIElementRoot("UI Flippable", menuCommand, s_ImageGUIElementSize); GameObject go = CreateUIElementRoot("UI Flippable", menuCommand, s_ImageGUIElementSize);
@ -710,10 +710,10 @@ namespace UnityEditor.UI
go.AddComponent<UIFlippable>(); go.AddComponent<UIFlippable>();
Selection.activeGameObject = go; Selection.activeGameObject = go;
} }
#endregion #endregion
#region UI WindowBase #region UI WindowBase
[MenuItem("GameObject/UI/Extensions/UI Window Base", false)] [MenuItem("GameObject/UI/Extensions/Controls/UI Window Base", false)]
static public void AddUIWindowBase(MenuCommand menuCommand) static public void AddUIWindowBase(MenuCommand menuCommand)
{ {
GameObject go = CreateUIElementRoot("UI Window Base", menuCommand, s_ThickGUIElementSize); GameObject go = CreateUIElementRoot("UI Window Base", menuCommand, s_ThickGUIElementSize);
@ -721,9 +721,9 @@ namespace UnityEditor.UI
go.AddComponent<Image>(); go.AddComponent<Image>();
Selection.activeGameObject = go; Selection.activeGameObject = go;
} }
#endregion #endregion
#region Accordion #region Accordion
[MenuItem("GameObject/UI/Extensions/Accordion/Accordion", false)] [MenuItem("GameObject/UI/Extensions/Accordion/Accordion", false)]
static public void AddAccordionVertical(MenuCommand menuCommand) static public void AddAccordionVertical(MenuCommand menuCommand)
{ {
@ -789,10 +789,10 @@ namespace UnityEditor.UI
var textText = textgo.AddComponent<Text>(); var textText = textgo.AddComponent<Text>();
textText.text = "This is an example of text in an accordion element\nLots of information can be put here for selection\nIf you like"; textText.text = "This is an example of text in an accordion element\nLots of information can be put here for selection\nIf you like";
} }
#endregion #endregion
#region Drop Down controls #region Drop Down controls
[MenuItem("GameObject/UI/Extensions/AutoComplete ComboBox", false)] [MenuItem("GameObject/UI/Extensions/ComboBox/AutoComplete ComboBox", false)]
static public void AddAutoCompleteComboBox(MenuCommand menuCommand) static public void AddAutoCompleteComboBox(MenuCommand menuCommand)
{ {
GameObject autoCompleteComboBoxRoot = CreateUIElementRoot("AutoCompleteComboBox", menuCommand, s_ThickGUIElementSize); GameObject autoCompleteComboBoxRoot = CreateUIElementRoot("AutoCompleteComboBox", menuCommand, s_ThickGUIElementSize);
@ -889,7 +889,7 @@ namespace UnityEditor.UI
Selection.activeGameObject = autoCompleteComboBoxRoot; Selection.activeGameObject = autoCompleteComboBoxRoot;
} }
[MenuItem("GameObject/UI/Extensions/ComboBox", false)] [MenuItem("GameObject/UI/Extensions/ComboBox/ComboBox", false)]
static public void AddComboBox(MenuCommand menuCommand) static public void AddComboBox(MenuCommand menuCommand)
{ {
GameObject comboBoxRoot = CreateUIElementRoot("ComboBox", menuCommand, s_ThickGUIElementSize); GameObject comboBoxRoot = CreateUIElementRoot("ComboBox", menuCommand, s_ThickGUIElementSize);
@ -986,7 +986,7 @@ namespace UnityEditor.UI
Selection.activeGameObject = comboBoxRoot; Selection.activeGameObject = comboBoxRoot;
} }
[MenuItem("GameObject/UI/Extensions/DropDownList", false)] [MenuItem("GameObject/UI/Extensions/ComboBox/DropDownList", false)]
static public void AddDropDownList(MenuCommand menuCommand) static public void AddDropDownList(MenuCommand menuCommand)
{ {
GameObject dropDownListRoot = CreateUIElementRoot("DropDownList", menuCommand, s_ThickGUIElementSize); GameObject dropDownListRoot = CreateUIElementRoot("DropDownList", menuCommand, s_ThickGUIElementSize);
@ -1118,9 +1118,9 @@ namespace UnityEditor.UI
arrowTextCanvasGroup.blocksRaycasts = false; arrowTextCanvasGroup.blocksRaycasts = false;
Selection.activeGameObject = dropDownListRoot; Selection.activeGameObject = dropDownListRoot;
} }
#endregion #endregion
#region RTS Selection box #region RTS Selection box
[MenuItem("GameObject/UI/Extensions/Selection Box", false)] [MenuItem("GameObject/UI/Extensions/Selection Box", false)]
static public void AddSelectionBox(MenuCommand menuCommand) static public void AddSelectionBox(MenuCommand menuCommand)
{ {
@ -1152,9 +1152,9 @@ namespace UnityEditor.UI
Selection.activeGameObject = go; Selection.activeGameObject = go;
} }
#endregion #endregion
#region Bound Tooltip #region Bound Tooltip
[MenuItem("GameObject/UI/Extensions/Bound Tooltip/Tooltip", false)] [MenuItem("GameObject/UI/Extensions/Bound Tooltip/Tooltip", false)]
static public void AddBoundTooltip(MenuCommand menuCommand) static public void AddBoundTooltip(MenuCommand menuCommand)
{ {
@ -1202,10 +1202,10 @@ namespace UnityEditor.UI
} }
} }
#endregion #endregion
#region Progress bar #region Progress bar
[MenuItem("GameObject/UI/Extensions/Progress Bar", false)] [MenuItem("GameObject/UI/Extensions/Controls/Progress Bar", false)]
static public void AddSlider(MenuCommand menuCommand) static public void AddSlider(MenuCommand menuCommand)
{ {
// Create GOs Hierarchy // Create GOs Hierarchy
@ -1249,9 +1249,9 @@ namespace UnityEditor.UI
slider.direction = Slider.Direction.LeftToRight; slider.direction = Slider.Direction.LeftToRight;
SetDefaultColorTransitionValues(slider); SetDefaultColorTransitionValues(slider);
} }
#endregion #endregion
#region Primitives #region Primitives
[MenuItem("GameObject/UI/Extensions/Primitives/UI Line Renderer", false)] [MenuItem("GameObject/UI/Extensions/Primitives/UI Line Renderer", false)]
static public void AddUILineRenderer(MenuCommand menuCommand) static public void AddUILineRenderer(MenuCommand menuCommand)
@ -1317,9 +1317,9 @@ namespace UnityEditor.UI
Selection.activeGameObject = go; Selection.activeGameObject = go;
} }
#endregion #endregion
#region Re-Orderable Lists #region Re-Orderable Lists
[MenuItem("GameObject/UI/Extensions/Re-orderable Lists/Re-orderable Vertical Scroll Rect", false)] [MenuItem("GameObject/UI/Extensions/Re-orderable Lists/Re-orderable Vertical Scroll Rect", false)]
static public void AddReorderableScrollRectVertical(MenuCommand menuCommand) static public void AddReorderableScrollRectVertical(MenuCommand menuCommand)
@ -1826,10 +1826,10 @@ namespace UnityEditor.UI
} }
#endregion #endregion
#region Segmented Control #region Segmented Control
[MenuItem("GameObject/UI/Extensions/Segmented Control", false)] [MenuItem("GameObject/UI/Extensions/Controls/Segmented Control", false)]
static public void AddSegmentedControl(MenuCommand menuCommand) static public void AddSegmentedControl(MenuCommand menuCommand)
{ {
GameObject go = CreateUIElementRoot("Segmented Control", menuCommand, s_ThickGUIElementSize); GameObject go = CreateUIElementRoot("Segmented Control", menuCommand, s_ThickGUIElementSize);
@ -1857,9 +1857,9 @@ namespace UnityEditor.UI
Selection.activeGameObject = go; Selection.activeGameObject = go;
} }
#endregion #endregion
#region Stepper #region Stepper
[MenuItem("GameObject/UI/Extensions/Sliders/Stepper", false)] [MenuItem("GameObject/UI/Extensions/Sliders/Stepper", false)]
static public void AddStepper(MenuCommand menuCommand) static public void AddStepper(MenuCommand menuCommand)
{ {
@ -1880,10 +1880,10 @@ namespace UnityEditor.UI
Selection.activeGameObject = go; Selection.activeGameObject = go;
} }
#endregion #endregion
#region UI Knob #region UI Knob
[MenuItem("GameObject/UI/Extensions/UI Knob", false)] [MenuItem("GameObject/UI/Extensions/Controls/UI Knob", false)]
static public void AddUIKnob(MenuCommand menuCommand) static public void AddUIKnob(MenuCommand menuCommand)
{ {
GameObject go = CreateUIElementRoot("UI Knob", menuCommand, s_ImageGUIElementSize); GameObject go = CreateUIElementRoot("UI Knob", menuCommand, s_ImageGUIElementSize);
@ -1891,19 +1891,19 @@ namespace UnityEditor.UI
go.AddComponent<UI_Knob>(); go.AddComponent<UI_Knob>();
Selection.activeGameObject = go; Selection.activeGameObject = go;
} }
#endregion #endregion
#region TextPic #region TextPic
[MenuItem("GameObject/UI/Extensions/TextPic", false)] [MenuItem("GameObject/UI/Extensions/Controls/TextPic", false)]
static public void AddTextPic(MenuCommand menuCommand) static public void AddTextPic(MenuCommand menuCommand)
{ {
GameObject go = CreateUIElementRoot("TextPic", menuCommand, s_ImageGUIElementSize); GameObject go = CreateUIElementRoot("TextPic", menuCommand, s_ImageGUIElementSize);
go.AddComponent<TextPic>(); go.AddComponent<TextPic>();
Selection.activeGameObject = go; Selection.activeGameObject = go;
} }
#endregion #endregion
#region BoxSlider #region BoxSlider
[MenuItem("GameObject/UI/Extensions/Sliders/Box Slider", false)] [MenuItem("GameObject/UI/Extensions/Sliders/Box Slider", false)]
static public void AddBoxSlider(MenuCommand menuCommand) static public void AddBoxSlider(MenuCommand menuCommand)
{ {
@ -1937,10 +1937,10 @@ namespace UnityEditor.UI
Selection.activeGameObject = uiboxSliderRoot; Selection.activeGameObject = uiboxSliderRoot;
} }
#endregion #endregion
#region Non Drawing Graphic options #region Non Drawing Graphic options
[MenuItem("GameObject/UI/Extensions/NonDrawingGraphic", false)] [MenuItem("GameObject/UI/Extensions/Controls/NonDrawingGraphic", false)]
static public void AddNonDrawingGraphic(MenuCommand menuCommand) static public void AddNonDrawingGraphic(MenuCommand menuCommand)
{ {
GameObject go = CreateUIElementRoot("NonDrawing Graphic", menuCommand, s_ImageGUIElementSize); GameObject go = CreateUIElementRoot("NonDrawing Graphic", menuCommand, s_ImageGUIElementSize);
@ -1948,7 +1948,7 @@ namespace UnityEditor.UI
Selection.activeGameObject = go; Selection.activeGameObject = go;
} }
[MenuItem("GameObject/UI/Extensions/NonDrawingGraphicClickable", false)] [MenuItem("GameObject/UI/Extensions/Controls/NonDrawingGraphicClickable", false)]
static public void AddClickableNonDrawingGraphic(MenuCommand menuCommand) static public void AddClickableNonDrawingGraphic(MenuCommand menuCommand)
{ {
GameObject go = CreateUIElementRoot("NonDrawing Graphic-Clickable", menuCommand, s_ImageGUIElementSize); GameObject go = CreateUIElementRoot("NonDrawing Graphic-Clickable", menuCommand, s_ImageGUIElementSize);
@ -1956,9 +1956,9 @@ namespace UnityEditor.UI
go.AddComponent<UISelectableExtension>(); go.AddComponent<UISelectableExtension>();
Selection.activeGameObject = go; Selection.activeGameObject = go;
} }
#endregion #endregion
#region Radial Slider #region Radial Slider
[MenuItem("GameObject/UI/Extensions/Sliders/Radial Slider", false)] [MenuItem("GameObject/UI/Extensions/Sliders/Radial Slider", false)]
static public void AddRadialSlider(MenuCommand menuCommand) static public void AddRadialSlider(MenuCommand menuCommand)
{ {
@ -1994,9 +1994,9 @@ namespace UnityEditor.UI
Selection.activeGameObject = sliderRoot; Selection.activeGameObject = sliderRoot;
} }
#endregion #endregion
#region RangeSlider #region RangeSlider
[MenuItem("GameObject/UI/Extensions/Sliders/Range Slider", false)] [MenuItem("GameObject/UI/Extensions/Sliders/Range Slider", false)]
static public void AddRangeSlider(MenuCommand menuCommand) static public void AddRangeSlider(MenuCommand menuCommand)
{ {
@ -2062,9 +2062,9 @@ namespace UnityEditor.UI
Selection.activeGameObject = minMaxSliderRoot; Selection.activeGameObject = minMaxSliderRoot;
} }
#endregion #endregion
#region Menu Manager GO #region Menu Manager GO
[MenuItem("GameObject/UI/Extensions/Menu Manager", false)] [MenuItem("GameObject/UI/Extensions/Menu Manager", false)]
static public void AddMenuManager(MenuCommand menuCommand) static public void AddMenuManager(MenuCommand menuCommand)
{ {
@ -2073,9 +2073,9 @@ namespace UnityEditor.UI
child.AddComponent<MenuManager>(); child.AddComponent<MenuManager>();
Selection.activeGameObject = child; Selection.activeGameObject = child;
} }
#endregion #endregion
#region MinMaxSlider #region MinMaxSlider
[MenuItem("GameObject/UI/Extensions/Sliders/MinMax Slider", false)] [MenuItem("GameObject/UI/Extensions/Sliders/MinMax Slider", false)]
static public void AddMinMaxSlider(MenuCommand menuCommand) static public void AddMinMaxSlider(MenuCommand menuCommand)
{ {
@ -2158,11 +2158,11 @@ namespace UnityEditor.UI
Selection.activeGameObject = minMaxSliderRoot; Selection.activeGameObject = minMaxSliderRoot;
} }
#endregion #endregion
#endregion #endregion
#region Helper Functions #region Helper Functions
private static GameObject AddInputFieldAsChild(GameObject parent) private static GameObject AddInputFieldAsChild(GameObject parent)
{ {
GameObject root = CreateUIObject("InputField", parent); GameObject root = CreateUIObject("InputField", parent);
@ -2302,7 +2302,6 @@ namespace UnityEditor.UI
return rectTransformRoot; return rectTransformRoot;
} }
#endregion #endregion
} }
} }