Skip to content

Commit 70e03d5

Browse files
authored
Fix: Fixed double separator showing up when opening context menu for files (#11253)
1 parent 9f213a9 commit 70e03d5

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

src/Files.App/BaseLayout.cs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -702,7 +702,11 @@ private void AddShellItemsToMenu(List<ContextMenuFlyoutItemViewModel> shellMenuI
702702
{
703703
var openWithSubItems = ItemModelListToContextFlyoutHelper.GetMenuFlyoutItemsFromModel(ShellContextmenuHelper.GetOpenWithItems(shellMenuItems));
704704
var mainShellMenuItems = shellMenuItems.RemoveFrom(!UserSettingsService.AppearanceSettingsService.MoveShellExtensionsToSubMenu ? int.MaxValue : shiftPressed ? 6 : 0);
705-
var overflowShellMenuItems = shellMenuItems.Except(mainShellMenuItems).ToList();
705+
var overflowShellMenuItemsUnfiltered = shellMenuItems.Except(mainShellMenuItems).ToList();
706+
var overflowShellMenuItems = overflowShellMenuItemsUnfiltered.Where(
707+
(x, i) => (x.ItemType == ItemType.Separator &&
708+
overflowShellMenuItemsUnfiltered[i + 1 < overflowShellMenuItemsUnfiltered.Count ? i + 1 : i].ItemType == ItemType.Separator)
709+
|| x.ItemType != ItemType.Separator).ToList();
706710

707711
var overflowItems = ItemModelListToContextFlyoutHelper.GetMenuFlyoutItemsFromModel(overflowShellMenuItems);
708712
var mainItems = ItemModelListToContextFlyoutHelper.GetAppBarButtonsFromModelIgnorePrimary(mainShellMenuItems);

0 commit comments

Comments
 (0)