Merge pull request #57 from Astone/order-changed-event

Add OrderChanged event to DataGrid

src/MyToolkit.Extended/Controls/DataGrid/DataGrid.cs

@@ -49,6 +49,9 @@ public DataGrid()
         /// <summary>Occurs when the selected item (row) has changed. </summary>
         public event EventHandler<SelectionChangedEventArgs> SelectionChanged;
 
+        /// <summary>Occurs when the order (column) has changed. </summary>
+        public event EventHandler<DataGridColumnEventArgs> OrderChanged;
+
         /// <summary>Occurs when the user clicked on an item and wants to navigate to its detail page. </summary>
         public event EventHandler<NavigationListEventArgs> Navigate;
 
@@ -216,7 +219,7 @@ public bool SelectColumn(DataGridColumnBase column, bool ascending)
                 SelectedColumn.IsSelected = true;
                 SelectedColumn.IsAscending = ascending;
 
-                UpdateItemsOrder();
+                OnOrderChanged(this, new DataGridColumnEventArgs(SelectedColumn));
                 return true;
             }
             return false;
@@ -315,6 +318,15 @@ private void OnSelectionChanged(object sender, SelectionChangedEventArgs e)
                 copy(this, e);
         }
 
+        private void OnOrderChanged(object sender, DataGridColumnEventArgs e)
+        {
+            UpdateItemsOrder();
+
+            var copy = OrderChanged;
+            if (copy != null)
+                copy(this, e);
+        }
+
         private void ChangeItemSelection(object item, bool isSelected)
         {
             var listBoxItem = _listControl.GetListBoxItemFromItem(item);

src/MyToolkit.Extended/Controls/DataGrid/DataGridColumnEventArgs.cs

@@ -0,0 +1,29 @@
+//-----------------------------------------------------------------------
+// <copyright file="DataGridColumnEventArgs.cs" company="MyToolkit">
+//     Copyright (c) Bram Stoeller. All rights reserved.
+// </copyright>
+// <license>https://github.com/MyToolkit/MyToolkit/blob/master/LICENSE.md</license>
+// <author>Bram Stoeller, [email protected]</author>
+//-----------------------------------------------------------------------
+
+#if WINRT
+
+using MyToolkit.Controls;
+using System;
+
+namespace MyToolkit.Controls
+{
+    public class DataGridColumnEventArgs : EventArgs
+    {
+        internal DataGridColumnEventArgs(DataGridColumnBase column)
+        {
+            Column = column;
+        }
+
+        /// <summary>Gets ordering column. </summary>
+        public DataGridColumnBase Column { private set; get; }
+
+    }
+}
+
+#endif

src/MyToolkit.Extended/MyToolkit.Extended.projitems

@@ -23,6 +23,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Controls\DataGrid\DataGridColumnBase.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\DataGrid\DataGridColumnCollection.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\DataGrid\DataGridExtensions.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Controls\DataGrid\DataGridColumnEventArgs.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\DataGrid\DataGridRow.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\DataGrid\DataGridTemplatedCell.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\DataGrid\DataGridTemplatedColumn.cs" />

src/SampleUwpApp/Views/DataGridPage.xaml

@@ -18,6 +18,7 @@
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="*" />
+                <RowDefinition Height="Auto" />
             </Grid.RowDefinitions>
 
             <StackPanel>
@@ -56,6 +57,11 @@
                 </Style>
             </controls:DataGrid.RowStyle>-->
             </controls:DataGrid>
+
+            <StackPanel Grid.Row="2" HorizontalAlignment="Right" Margin="0,10,10,0">
+                <TextBlock Text="Loading" x:Name="Status" />
+            </StackPanel>
+
         </Grid>
     </Grid>
 </paging:MtPage>

src/SampleUwpApp/Views/DataGridPage.xaml.cs

@@ -20,6 +20,14 @@ public DataGridPage()
                         p.Category.ToLower().Contains(Model.Filter.ToLower()));
                 }
             };
+            DataGrid.OrderChanged += (sender, args) =>
+            {
+                Status.Text = string.Format(
+                    "Items are ordered by {0} ({1})",
+                    args.Column.OrderPropertyPath.Path,
+                    (args.Column.IsAscending ? "ascending" : "descending")
+                );
+            };
         }
 
         public DataGridPageModel Model