Merge pull request #36 from HandyOrg/master

fixed a bug of SideMenu
This commit is contained in:
眾尋 authored and GitHub committed 2019-06-04 08:31:44 +08:00
commit db67e0c06d
1 file changed
+35 -2
@@ -141,8 +141,41 @@ namespace HandyControl.Controls
} }
else if (mode == ExpandMode.ShowOne) else if (mode == ExpandMode.ShowOne)
{ {
var sideMenuItem = ItemsHost.Children.OfType<SideMenuItem>().FirstOrDefault(item => item.IsSelected); SideMenuItem sideMenuItemSelected = null;
ShowSelectedOne(sideMenuItem); foreach (var sideMenuItem in ItemsHost.Children.OfType<SideMenuItem>())
{
if (sideMenuItemSelected != null)
{
sideMenuItem.IsSelected = false;
if (sideMenuItem.ItemsHost != null)
{
foreach (var sideMenuSubItem in sideMenuItem.ItemsHost.Children.OfType<SideMenuItem>())
{
sideMenuSubItem.IsSelected = false;
}
}
}
else if (sideMenuItem.IsSelected)
{
ShowSelectedOne(sideMenuItem);
sideMenuItemSelected = sideMenuItem;
if (sideMenuItem.ItemsHost != null)
{
foreach (var sideMenuSubItem in sideMenuItem.ItemsHost.Children.OfType<SideMenuItem>())
{
if (_selectedItem != null)
{
sideMenuSubItem.IsSelected = false;
}
else if (sideMenuSubItem.IsSelected)
{
_selectedItem = sideMenuSubItem;
}
}
}
}
}
} }
} }