Force nesting when there is any sub menu in AddTypeMenu attribute.

yellowisher · yellowisher · commit 1f76157be044 · 2022-08-25T00:00:26.000+09:00
diff --git a/Assets/MackySoft/MackySoft.SerializeReferenceExtensions/Editor/AdvancedTypePopup.cs b/Assets/MackySoft/MackySoft.SerializeReferenceExtensions/Editor/AdvancedTypePopup.cs
@@ -44,6 +44,11 @@ public static void AddTo (AdvancedDropdownItem root,IEnumerable<Type> types) {
 				if (splittedTypePath.Length <= 1) {
 					continue;
 				}
+				// If they explicitly want sub category, let them do.
+				if (TypeMenuUtility.GetAttribute(type) != null) {
+					isSingleNamespace = false;
+					break;
+				}
 				for (int k = 0;(splittedTypePath.Length - 1) > k;k++) {
 					string ns = namespaces[k];
 					if (ns == null) {
@@ -54,6 +59,10 @@ public static void AddTo (AdvancedDropdownItem root,IEnumerable<Type> types) {
 						break;
 					}
 				}
+
+				if (!isSingleNamespace) {
+					break;
+				}
 			}
 
 			// Add type items.

Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,11 @@ public static void AddTo (AdvancedDropdownItem root,IEnumerable<Type> types) {`
`44`	`44`	`if (splittedTypePath.Length <= 1) {`
`45`	`45`	`continue;`
`46`	`46`	`}`
	`47`	`+ // If they explicitly want sub category, let them do.`
	`48`	`+ if (TypeMenuUtility.GetAttribute(type) != null) {`
	`49`	`+ isSingleNamespace = false;`
	`50`	`+ break;`
	`51`	`+ }`
`47`	`52`	`for (int k = 0;(splittedTypePath.Length - 1) > k;k++) {`
`48`	`53`	`string ns = namespaces[k];`
`49`	`54`	`if (ns == null) {`
`@@ -54,6 +59,10 @@ public static void AddTo (AdvancedDropdownItem root,IEnumerable<Type> types) {`
`54`	`59`	`break;`
`55`	`60`	`}`
`56`	`61`	`}`
	`62`	`+`
	`63`	`+ if (!isSingleNamespace) {`
	`64`	`+ break;`
	`65`	`+ }`
`57`	`66`	`}`
`58`	`67`
`59`	`68`	`// Add type items.`