diff --git a/Packages/nadena.dev.modular-avatar/Editor/Inspector/MenuFolderCreatorEditor.cs b/Packages/nadena.dev.modular-avatar/Editor/Inspector/MenuFolderCreatorEditor.cs index 829ea911..381e4556 100644 --- a/Packages/nadena.dev.modular-avatar/Editor/Inspector/MenuFolderCreatorEditor.cs +++ b/Packages/nadena.dev.modular-avatar/Editor/Inspector/MenuFolderCreatorEditor.cs @@ -64,6 +64,9 @@ namespace nadena.dev.modular_avatar.core.editor { SerializedProperty folderNameProperty = this.serializedObject.FindProperty(nameof(ModularAvatarMenuFolderCreator.folderName)); EditorGUILayout.PropertyField(folderNameProperty, new GUIContent("Folder Name")); + SerializedProperty iconProperty = this.serializedObject.FindProperty(nameof(ModularAvatarMenuFolderCreator.icon)); + EditorGUILayout.PropertyField(iconProperty, new GUIContent("Folder Icon")); + serializedObject.ApplyModifiedProperties(); Localization.ShowLanguageUI(); } diff --git a/Packages/nadena.dev.modular-avatar/Editor/MenuFolderCreateHook.cs b/Packages/nadena.dev.modular-avatar/Editor/MenuFolderCreateHook.cs index e826e397..7903c212 100644 --- a/Packages/nadena.dev.modular-avatar/Editor/MenuFolderCreateHook.cs +++ b/Packages/nadena.dev.modular-avatar/Editor/MenuFolderCreateHook.cs @@ -58,7 +58,7 @@ namespace nadena.dev.modular_avatar.core.editor { this._creatFolders[rootCreator] = folderMenu; } - AddSubMenuElement(targetMenu, rootCreator.folderName, folderMenu); // TODO: Support Custom Icon + AddSubMenuElement(targetMenu, rootCreator.folderName, folderMenu, rootCreator.icon); if (!this._childMap.TryGetValue(rootCreator, out List children)) continue; foreach (ModularAvatarMenuFolderCreator child in children) { this.CreateChildFolder(child); @@ -81,7 +81,7 @@ namespace nadena.dev.modular_avatar.core.editor { this._creatFolders[creator] = folderMenu; } - AddSubMenuElement(targetMenu, creator.folderName, folderMenu); // TODO: Support Custom Icon + AddSubMenuElement(targetMenu, creator.folderName, folderMenu, creator.icon); if (!this._childMap.TryGetValue(creator, out List children)) return; foreach (ModularAvatarMenuFolderCreator child in children) { this.CreateChildFolder(child); diff --git a/Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarMenuFolderCreator.cs b/Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarMenuFolderCreator.cs index ec6ae3bd..71fb0fcb 100644 --- a/Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarMenuFolderCreator.cs +++ b/Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarMenuFolderCreator.cs @@ -8,6 +8,7 @@ namespace nadena.dev.modular_avatar.core { public VRCExpressionsMenu installTargetMenu; public ModularAvatarMenuFolderCreator installTargetFolderCreator; public string folderName; + public Texture2D icon; public enum InstallTargetType {