diff --git a/src/client/spark/view/Extensions/WPFExtensions.cs b/src/client/spark/view/Extensions/WPFExtensions.cs index fdbb060f1..4c0c82877 100644 --- a/src/client/spark/view/Extensions/WPFExtensions.cs +++ b/src/client/spark/view/Extensions/WPFExtensions.cs @@ -154,74 +154,47 @@ namespace mbts.ui { return result != null; } - public static T find_ancestor_of_type(this FrameworkElement element) where T : DependencyObject { - if (element.Parent is T) - return (T)element.Parent; - else if (element.TemplatedParent is T) - return (T)element.TemplatedParent; - else { - FrameworkElement logical_parent = VisualTreeHelper.GetParent(element) as FrameworkElement; - if (logical_parent != null) { - var rv = logical_parent.find_ancestor_of_type(); - if (rv is T) - return (T)rv; - } - FrameworkContentElement content_parent = VisualTreeHelper.GetParent(element) as FrameworkContentElement; - if (content_parent != null) { - var rv = content_parent.find_ancestor_of_type(); - if (rv is T) - return (T)rv; - } - if (element.Parent is FrameworkElement) { - var rv = ((FrameworkElement)element.Parent).find_ancestor_of_type(); - if (rv is T) - return (T)rv; - } else if (element.Parent is FrameworkContentElement) { - var rv = ((FrameworkContentElement)element.Parent).find_ancestor_of_type(); - if (rv is T) - return (T)rv; - } - if (element.TemplatedParent is FrameworkElement) { - var rv = ((FrameworkElement)element.TemplatedParent).find_ancestor_of_type(); - if (rv is T) - return (T)rv; - } else if (element.TemplatedParent is FrameworkContentElement) { - var rv = ((FrameworkContentElement)element.TemplatedParent).find_ancestor_of_type(); - if (rv is T) - return (T)rv; - } - } - return default(T); - } + public static T find_ancestor_of_type(this FrameworkElement element) where T : DependencyObject { + return candidates().ExceptNull().Distinct().Select(impl).ExceptNull().FirstOrDefault(); + T impl(DependencyObject d) { + if (d is T direct_match) + return direct_match; + if (d is FrameworkElement el) { + if (el.find_ancestor_of_type() is T rv) + return rv; + } else if (d is FrameworkContentElement cel) { + if (cel.find_ancestor_of_type() is T rv) + return rv; + } + return null; + } + IEnumerable candidates() { + yield return element.Parent; + yield return element.TemplatedParent; + yield return VisualTreeHelper.GetParent(element); + } + } - public static T find_ancestor_of_type(this FrameworkContentElement element) where T : DependencyObject { - if (element.Parent is T) - return (T)element.Parent; - else if (element.TemplatedParent is T) - return (T)element.TemplatedParent; - else { - if (element.Parent is FrameworkElement) { - var rv = ((FrameworkElement)element.Parent).find_ancestor_of_type(); - if (rv is T) - return (T)rv; - } else if (element.Parent is FrameworkContentElement) { - var rv = ((FrameworkContentElement)element.Parent).find_ancestor_of_type(); - if (rv is T) - return (T)rv; - } - if (element.TemplatedParent is FrameworkElement) { - var rv = ((FrameworkElement)element.TemplatedParent).find_ancestor_of_type(); - if (rv is T) - return (T)rv; - } - if (element.TemplatedParent is FrameworkContentElement) { - var rv = ((FrameworkContentElement)element.TemplatedParent).find_ancestor_of_type(); - if (rv is T) - return (T)rv; - } - } - return default(T); - } + public static T find_ancestor_of_type(this FrameworkContentElement element) where T : DependencyObject { + return candidates().ExceptNull().Distinct().Select(impl).ExceptNull().FirstOrDefault(); + T impl(DependencyObject d) { + if (d is T direct_match) + return direct_match; + if (d is FrameworkElement el) { + if (el.find_ancestor_of_type() is T rv) + return rv; + } else if (d is FrameworkContentElement cel) { + if (cel.find_ancestor_of_type() is T rv) + return rv; + } + return null; + } + IEnumerable candidates() { + yield return element.Parent; + yield return element.TemplatedParent; + yield return VisualTreeHelper.GetParent(element); + } + } public static void clear_bindings(this DependencyObject d_obj, params DependencyProperty[] d_props) { foreach (var dp in d_props) @@ -379,6 +352,16 @@ namespace mbts.ui { .Where(sc => sc.col_name != null) .ToList(); + /// + /// Converts .SortDescriptions into a List<>. + /// + public static List get_sorting_criteria(this ICollectionView collection_view, IEnumerable<(string id, string path)> columns) => + collection_view.SortDescriptions + .Select(sd => columns.TryGetFirst(c => c.path == sd.PropertyName, out var col) ? + new SortingCriteria(col.id, sd.Direction == ListSortDirection.Ascending) : null) + .Where(sc => sc?.col_name != null) + .ToList(); + /// /// Converts each into a and assigns the result to .SortDescriptions. ///