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

isControlOnlyMenu flag changed to hasChildMenu flag. This one matches the early return.

Browse Source
This commit is contained in:
raiti-chan 2022-12-18 19:02:55 +09:00
parent ead1b69856
commit 07b9d2ae7e
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Packages/nadena.dev.modular-avatar/Editor/MenuTree.cs
View File

@ -121,10 +121,10 @@ namespace nadena.dev.modular_avatar.core.editor
} }
VRCExpressionsMenu[] parentsMenus = parents.DefaultIfEmpty(installer.installTargetMenu).ToArray(); VRCExpressionsMenu[] parentsMenus = parents.DefaultIfEmpty(installer.installTargetMenu).ToArray();
bool isControlOnlyMenu = true; bool hasChildMenu = false;
foreach (KeyValuePair<string, VRCExpressionsMenu> childMenu in childMenus) foreach (KeyValuePair<string, VRCExpressionsMenu> childMenu in childMenus)
{ {
isControlOnlyMenu = false; hasChildMenu = true;
ChildElement childElement = new ChildElement ChildElement childElement = new ChildElement
{ {
menuName = childMenu.Key, menuName = childMenu.Key,
@ -138,17 +138,16 @@ namespace nadena.dev.modular_avatar.core.editor
} }
} }
if (!isControlOnlyMenu) return; if (hasChildMenu) return;
foreach (VRCExpressionsMenu parentMenu in parentsMenus)
{ {
foreach (VRCExpressionsMenu parentMenu in parentsMenus) TraverseMenu(parentMenu, new ChildElement
{ {
TraverseMenu(parentMenu, new ChildElement installer = installer,
{ isInstallerRoot = true
installer = installer, });
isInstallerRoot = true
});
}
} }
} }
private void TraverseMenu(VRCExpressionsMenu parent, ChildElement childElement) private void TraverseMenu(VRCExpressionsMenu parent, ChildElement childElement)