AnimeFunsion/modular-avatar
1
0
Fork 0
mirror of https://github.com/bdunderscore/modular-avatar.git synced 2025-04-24 13:29:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Support folder icon

Browse Source 
(cherry picked from commit 0812551dcad3e7fadf174fd66a61358ffb5e62d5)
This commit is contained in:
raiti-chan 2022-12-02 21:40:08 +09:00
parent 7bf3136e00
commit 69d18b854a
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Packages/nadena.dev.modular-avatar/Editor/Inspector/MenuFolderCreatorEditor.cs
View File

@ -64,6 +64,9 @@ namespace nadena.dev.modular_avatar.core.editor {
SerializedProperty folderNameProperty = this.serializedObject.FindProperty(nameof(ModularAvatarMenuFolderCreator.folderName)); SerializedProperty folderNameProperty = this.serializedObject.FindProperty(nameof(ModularAvatarMenuFolderCreator.folderName));
EditorGUILayout.PropertyField(folderNameProperty, new GUIContent("Folder Name")); EditorGUILayout.PropertyField(folderNameProperty, new GUIContent("Folder Name"));
SerializedProperty iconProperty = this.serializedObject.FindProperty(nameof(ModularAvatarMenuFolderCreator.icon));
EditorGUILayout.PropertyField(iconProperty, new GUIContent("Folder Icon"));
serializedObject.ApplyModifiedProperties(); serializedObject.ApplyModifiedProperties();
Localization.ShowLanguageUI(); Localization.ShowLanguageUI();
} }

4
Packages/nadena.dev.modular-avatar/Editor/MenuFolderCreateHook.cs
View File

@ -58,7 +58,7 @@ namespace nadena.dev.modular_avatar.core.editor {
this._creatFolders[rootCreator] = folderMenu; 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<ModularAvatarMenuFolderCreator> children)) continue; if (!this._childMap.TryGetValue(rootCreator, out List<ModularAvatarMenuFolderCreator> children)) continue;
foreach (ModularAvatarMenuFolderCreator child in children) { foreach (ModularAvatarMenuFolderCreator child in children) {
this.CreateChildFolder(child); this.CreateChildFolder(child);
@ -81,7 +81,7 @@ namespace nadena.dev.modular_avatar.core.editor {
this._creatFolders[creator] = folderMenu; 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<ModularAvatarMenuFolderCreator> children)) return; if (!this._childMap.TryGetValue(creator, out List<ModularAvatarMenuFolderCreator> children)) return;
foreach (ModularAvatarMenuFolderCreator child in children) { foreach (ModularAvatarMenuFolderCreator child in children) {
this.CreateChildFolder(child); this.CreateChildFolder(child);

1
Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarMenuFolderCreator.cs
View File

@ -8,6 +8,7 @@ namespace nadena.dev.modular_avatar.core {
public VRCExpressionsMenu installTargetMenu; public VRCExpressionsMenu installTargetMenu;
public ModularAvatarMenuFolderCreator installTargetFolderCreator; public ModularAvatarMenuFolderCreator installTargetFolderCreator;
public string folderName; public string folderName;
public Texture2D icon;
public enum InstallTargetType { public enum InstallTargetType {