Fixed issues with sorting items from the right click context menu (#2039)

Author: Thomas1664

Files/Views/LayoutModes/GenericFileBrowser.xaml

@@ -36,33 +36,46 @@
                 </MenuFlyoutSubItem.Icon>
                 <muxc:RadioMenuFlyoutItem
                     x:Uid="BaseLayoutContextFlyoutSortByName"
+                    Click="RadioMenuSortColumn_Click"
                     GroupName="SortGroup"
+                    IsChecked="{x:Bind AssociatedViewModel.IsSortedByName, Mode=TwoWay}"
+                    Tag="nameColumn"
                     Text="Name" />
                 <muxc:RadioMenuFlyoutItem
                     x:Uid="BaseLayoutContextFlyoutSortByDate"
+                    Click="RadioMenuSortColumn_Click"
                     GroupName="SortGroup"
                     IsChecked="{x:Bind AssociatedViewModel.IsSortedByDate, Mode=TwoWay}"
+                    Tag="dateColumn"
                     Text="Date modified" />
                 <muxc:RadioMenuFlyoutItem
                     x:Uid="BaseLayoutContextFlyoutSortByType"
+                    Click="RadioMenuSortColumn_Click"
                     GroupName="SortGroup"
                     IsChecked="{x:Bind AssociatedViewModel.IsSortedByType, Mode=TwoWay}"
+                    Tag="typeColumn"
                     Text="Type" />
                 <muxc:RadioMenuFlyoutItem
                     x:Uid="BaseLayoutContextFlyoutSortBySize"
+                    Click="RadioMenuSortColumn_Click"
                     GroupName="SortGroup"
                     IsChecked="{x:Bind AssociatedViewModel.IsSortedBySize, Mode=TwoWay}"
+                    Tag="sizeColumn"
                     Text="Size" />
                 <MenuFlyoutSeparator />
                 <muxc:RadioMenuFlyoutItem
                     x:Uid="BaseLayoutContextFlyoutSortByAscending"
+                    Click="RadioMenuSortDirection_Click"
                     GroupName="SortOrderGroup"
                     IsChecked="{x:Bind AssociatedViewModel.IsSortedAscending, Mode=TwoWay}"
+                    Tag="sortAscending"
                     Text="Ascending" />
                 <muxc:RadioMenuFlyoutItem
                     x:Uid="BaseLayoutContextFlyoutSortByDescending"
+                    Click="RadioMenuSortDirection_Click"
                     GroupName="SortOrderGroup"
                     IsChecked="{x:Bind AssociatedViewModel.IsSortedDescending, Mode=TwoWay}"
+                    Tag="sortDescending"
                     Text="Descending" />
             </MenuFlyoutSubItem>
             <MenuFlyoutSubItem x:Uid="BaseLayoutContextFlyoutLayoutMode" Text="Layout mode">
@@ -211,34 +224,46 @@
                 </MenuFlyoutSubItem.Icon>
                 <muxc:RadioMenuFlyoutItem
                     x:Uid="BaseLayoutContextFlyoutSortByName"
+                    Click="RadioMenuSortColumn_Click"
                     GroupName="SortGroup"
                     IsChecked="{x:Bind AssociatedViewModel.IsSortedByName, Mode=TwoWay}"
+                    Tag="nameColumn"
                     Text="Name" />
                 <muxc:RadioMenuFlyoutItem
                     x:Uid="BaseLayoutContextFlyoutSortByDate"
+                    Click="RadioMenuSortColumn_Click"
                     GroupName="SortGroup"
                     IsChecked="{x:Bind AssociatedViewModel.IsSortedByDate, Mode=TwoWay}"
+                    Tag="dateColumn"
                     Text="Date modified" />
                 <muxc:RadioMenuFlyoutItem
                     x:Uid="BaseLayoutContextFlyoutSortByType"
+                    Click="RadioMenuSortColumn_Click"
                     GroupName="SortGroup"
                     IsChecked="{x:Bind AssociatedViewModel.IsSortedByType, Mode=TwoWay}"
+                    Tag="typeColumn"
                     Text="Type" />
                 <muxc:RadioMenuFlyoutItem
                     x:Uid="BaseLayoutContextFlyoutSortBySize"
+                    Click="RadioMenuSortColumn_Click"
                     GroupName="SortGroup"
                     IsChecked="{x:Bind AssociatedViewModel.IsSortedBySize, Mode=TwoWay}"
+                    Tag="sizeColumn"
                     Text="Size" />
                 <MenuFlyoutSeparator />
                 <muxc:RadioMenuFlyoutItem
                     x:Uid="BaseLayoutContextFlyoutSortByAscending"
+                    Click="RadioMenuSortDirection_Click"
                     GroupName="SortOrderGroup"
                     IsChecked="{x:Bind AssociatedViewModel.IsSortedAscending, Mode=TwoWay}"
+                    Tag="sortAscending"
                     Text="Ascending" />
                 <muxc:RadioMenuFlyoutItem
                     x:Uid="BaseLayoutContextFlyoutSortByDescending"
+                    Click="RadioMenuSortDirection_Click"
                     GroupName="SortOrderGroup"
                     IsChecked="{x:Bind AssociatedViewModel.IsSortedDescending, Mode=TwoWay}"
+                    Tag="sortDescending"
                     Text="Descending" />
             </MenuFlyoutSubItem>
             <MenuFlyoutItem

Files/Views/LayoutModes/GenericFileBrowser.xaml.cs

@@ -3,6 +3,7 @@
 using Files.Helpers;
 using Microsoft.Toolkit.Uwp.UI;
 using Microsoft.Toolkit.Uwp.UI.Controls;
+using Microsoft.UI.Xaml.Controls;
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -457,5 +458,46 @@ protected override ListedItem GetItemFromElement(object element)
             DataGridRow row = element as DataGridRow;
             return row.DataContext as ListedItem;
         }
+
+        private void RadioMenuSortColumn_Click(object sender, RoutedEventArgs e)
+        {
+            DataGridColumnEventArgs args = null;
+
+            switch ((sender as RadioMenuFlyoutItem).Tag)
+            {
+                case "nameColumn":
+                    args = new DataGridColumnEventArgs(nameColumn);
+                    break;
+
+                case "dateColumn":
+                    args = new DataGridColumnEventArgs(dateColumn);
+                    break;
+
+                case "typeColumn":
+                    args = new DataGridColumnEventArgs(typeColumn);
+                    break;
+
+                case "sizeColumn":
+                    args = new DataGridColumnEventArgs(sizeColumn);
+                    break;
+            }
+
+            if (args != null)
+            {
+                AllView_Sorting(sender, args);
+            }
+        }
+
+        private void RadioMenuSortDirection_Click(object sender, RoutedEventArgs e)
+        {
+            if (((sender as RadioMenuFlyoutItem).Tag as string) == "sortAscending")
+            {
+                SortedColumn.SortDirection = DataGridSortDirection.Ascending;
+            }
+            else if (((sender as RadioMenuFlyoutItem).Tag as string) == "sortDescending")
+            {
+                SortedColumn.SortDirection = DataGridSortDirection.Descending;
+            }
+        }
     }
 }

Files/Views/LayoutModes/GridViewBrowser.xaml

@@ -33,6 +33,7 @@
                 <muxc:RadioMenuFlyoutItem
                     x:Uid="BaseLayoutContextFlyoutSortByName"
                     GroupName="SortGroup"
+                    IsChecked="{x:Bind AssociatedViewModel.IsSortedByName, Mode=TwoWay}"
                     Text="Name" />
                 <muxc:RadioMenuFlyoutItem
                     x:Uid="BaseLayoutContextFlyoutSortByDate"