Merge pull request #23 from yellowisher/improve/name_as_tie_breaker

mackysoft · web-flow · commit a89eb6bb8709 · 2022-08-26T18:49:29.000+09:00
Use menu name or type name as tie breaker.
diff --git a/Assets/MackySoft/MackySoft.SerializeReferenceExtensions/Editor/TypeMenuUtility.cs b/Assets/MackySoft/MackySoft.SerializeReferenceExtensions/Editor/TypeMenuUtility.cs
@@ -32,6 +32,11 @@ public static IEnumerable<Type> OrderByType (this IEnumerable<Type> source) {
 					return -999;
 				}
 				return GetAttribute(type)?.Order ?? 0;
+			}).ThenBy(type => {
+				if (type == null) {
+					return null;
+				}
+				return GetAttribute(type)?.MenuName ?? type.Name;
 			});
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,11 @@ public static IEnumerable<Type> OrderByType (this IEnumerable<Type> source) {`
`32`	`32`	`return -999;`
`33`	`33`	`}`
`34`	`34`	`return GetAttribute(type)?.Order ?? 0;`
	`35`	`+ }).ThenBy(type => {`
	`36`	`+ if (type == null) {`
	`37`	`+ return null;`
	`38`	`+ }`
	`39`	`+ return GetAttribute(type)?.MenuName ?? type.Name;`
`35`	`40`	`});`
`36`	`41`	`}`
`37`	`42`