PriorityGrid: flattening, priority and hierarchy sorting, nullable types, search bar hiding and fixes

src/Net_40/HandyControl_Net_40/Themes/Theme.xaml

@@ -699,8 +699,16 @@
 				<GeometryDrawing o:Freeze="True" Brush="#FF00529C" Geometry="F1M15,8L15,10 12,13 9,10 9,8 11,10 11,4 13,4 13,10z" />
 			</DrawingGroup>
 		</DrawingBrush.Drawing>
-	</DrawingBrush>
-	<ItemsPanelTemplate x:Key="StepBarHorizontalItemsPanelTemplate">
+    </DrawingBrush>
+    <DrawingBrush x:Key="SortByHierarchyLevelDrawingBrush" o:Freeze="True">
+        <DrawingBrush.Drawing>
+            <DrawingGroup o:Freeze="True">
+                <GeometryDrawing o:Freeze="True" Brush="#FF000000" Geometry="F1 M470,470z M0,0z M346.494,283.658L346.494,358.951 296.758,358.951 296.758,283.658 245,283.658 245,186.343 296.758,186.343 296.758,0 173.242,0 173.242,186.343 225,186.343 225,283.658 173.242,283.658 173.242,358.951 123.516,358.951 123.516,283.658 0,283.658 0,470 123.516,470 123.516,378.951 173.242,378.951 173.242,470 296.758,470 296.758,378.951 346.494,378.951 346.494,470 470,470 470,283.658 346.494,283.658z M193.242,20L276.758,20 276.758,166.343 193.242,166.343 193.242,20z M103.516,450L20,450 20,303.658 103.516,303.658 103.516,450z M276.758,450L193.242,450 193.242,303.658 276.758,303.658 276.758,450z M450,450L366.494,450 366.494,303.658 450,303.658 450,450z" />
+            </DrawingGroup>
+        </DrawingBrush.Drawing>
+    </DrawingBrush>
+
+    <ItemsPanelTemplate x:Key="StepBarHorizontalItemsPanelTemplate">
 		<UniformGrid Rows="1" />
 	</ItemsPanelTemplate>
 	<ItemsPanelTemplate x:Key="StepBarVerticalItemsPanelTemplate">
@@ -9975,18 +9983,29 @@
 								<RowDefinition Height="Auto" />
 								<RowDefinition />
 							</Grid.RowDefinitions>
-							<DockPanel LastChildFill="True" Margin="0,0,0,6">
-								<hc:ButtonGroup Margin="0,0,6,0" Visibility="{Binding ShowSortButton,RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource Boolean2VisibilityConverter}}" Style="{StaticResource ButtonGroupSolid}">
-									<RadioButton Command="interactivity:ControlCommands.SortByCategory" IsChecked="True">
-										<Rectangle Width="16" Height="16" Fill="{StaticResource SortByCategoryDrawingBrush}" />
-									</RadioButton>
-									<RadioButton Command="interactivity:ControlCommands.SortByName">
-										<Rectangle Width="16" Height="16" Fill="{StaticResource SortByNameDrawingBrush}" />
-									</RadioButton>
-								</hc:ButtonGroup>
-								<hc:SearchBar x:Name="PART_SearchBar" IsRealTime="True" ShowClearButton="True" Style="{StaticResource SearchBarPlus}" />
-							</DockPanel>
-							<hc:PropertyItemsControl Grid.Row="1" x:Name="PART_ItemsControl" Style="{StaticResource PropertyItemsControlBaseStyle}">
+                            <DockPanel LastChildFill="True" Margin="0,0,0,6">
+                                <DockPanel.Visibility>
+                                    <MultiBinding Converter="{StaticResource BooleanArr2VisibilityConverter}"
+                                                  ConverterParameter="UseAny">
+                                        <Binding Path="ShowSortButton" RelativeSource="{RelativeSource TemplatedParent}" />
+                                        <Binding Path="ShowSearchBar" RelativeSource="{RelativeSource TemplatedParent}" />
+                                    </MultiBinding>
+                                </DockPanel.Visibility>
+                                <hc:ButtonGroup Margin="0,0,6,0" Visibility="{Binding ShowSortButton,RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource Boolean2VisibilityConverter}}" Style="{StaticResource ButtonGroupSolid}">
+                                    <RadioButton Command="interactivity:ControlCommands.SortByCategory" IsChecked="True">
+                                        <Rectangle Width="16" Height="16" Fill="{StaticResource SortByCategoryDrawingBrush}" />
+                                    </RadioButton>
+                                    <RadioButton Command="interactivity:ControlCommands.SortByName">
+                                        <Rectangle Width="16" Height="16" Fill="{StaticResource SortByNameDrawingBrush}" />
+                                    </RadioButton>
+                                    <RadioButton Command="interactivity:ControlCommands.SortByHierarchyLevel">
+                                        <Rectangle Width="16" Height="16" Fill="{StaticResource SortByHierarchyLevelDrawingBrush}" />
+                                    </RadioButton>
+                                </hc:ButtonGroup>
+                                <hc:SearchBar x:Name="PART_SearchBar" IsRealTime="True" ShowClearButton="True" Style="{StaticResource SearchBarPlus}"
+                                              Visibility="{Binding ShowSearchBar, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource Boolean2VisibilityConverter}}" />
+                            </DockPanel>
+                            <hc:PropertyItemsControl Grid.Row="1" x:Name="PART_ItemsControl" Style="{StaticResource PropertyItemsControlBaseStyle}">
 								<hc:PropertyItemsControl.GroupStyle>
 									<GroupStyle ContainerStyle="{StaticResource PropertyGroupItemBaseStyle}" />
 								</hc:PropertyItemsControl.GroupStyle>
@@ -13728,4 +13747,4 @@
 	</Style>
 	<Style BasedOn="{StaticResource RangeSliderBaseStyle}" TargetType="hc:RangeSlider" />
 	<Style BasedOn="{StaticResource SliderBaseStyle}" TargetType="Slider" />
-</ResourceDictionary>
+</ResourceDictionary>

src/Shared/HandyControlDemo_Shared/Data/Model/PropertyGridDemoModel.cs

@@ -1,6 +1,7 @@
 using System.ComponentModel;
 using System.Windows;
 using System.Windows.Media;
+using HandyControl.Controls;
 
 namespace HandyControlDemo.Data
 {
@@ -12,12 +13,15 @@ public class PropertyGridDemoModel
         [Category("Category2")]
         public int Integer { get; set; }
 
-        [Category("Category2")]
+        [Category("Category1"), Priority(3)]
         public bool Boolean { get; set; }
 
-        [Category("Category1")]
+        [Category("Category1"), Priority(5), Necessary]
         public Gender Enum { get; set; }
 
+        [Category("Category1"), Priority(4)]
+        public DemoDataModel FlattenedType { get; set; }
+
         public HorizontalAlignment HorizontalAlignment { get; set; }
 
         public VerticalAlignment VerticalAlignment { get; set; }

src/Shared/HandyControlDemo_Shared/UserControl/Controls/PropertyGridDemoCtl.xaml

@@ -10,7 +10,19 @@
                 <RowDefinition Height="Auto"/>
                 <RowDefinition Height="Auto"/>
             </Grid.RowDefinitions>
-            <hc:PropertyGrid Width="500" SelectedObject="{Binding DemoModel}"/>
+
+            <hc:PropertyGrid Width="500"
+                               SelectedObject="{Binding DemoModel}"
+                               FlattenChildProperties="ParentNameAsCategory"
+                               GroupHeaderMargin="0,0,0,5"
+                               SortByPriority="True">
+                <hc:PropertyGrid.GroupHeaderTemplate>
+                    <DataTemplate>
+                        <TextBlock Height="20" Text="{Binding}" />
+                    </DataTemplate>
+                </hc:PropertyGrid.GroupHeaderTemplate>
+            </hc:PropertyGrid>
+
             <StackPanel hc:TitleElement.TitleWidth="168" Grid.Row="1" Margin="20,16,17,10">
                 <TextBox hc:TitleElement.Title="String" hc:TitleElement.TitlePlacement="Left" Style="{StaticResource TextBoxExtend}" Text="{Binding DemoModel.String,Mode=OneWay}" IsReadOnly="True"/>
                 <TextBox hc:TitleElement.Title="Enum" hc:TitleElement.TitlePlacement="Left" Style="{StaticResource TextBoxExtend}" Text="{Binding DemoModel.Enum,Mode=OneWay}" IsReadOnly="True" Margin="0,6,0,0"/>

src/Shared/HandyControlDemo_Shared/UserControl/Controls/PropertyGridDemoCtl.xaml.cs

@@ -11,11 +11,12 @@ public PropertyGridDemoCtl()
 
             DemoModel = new PropertyGridDemoModel
             {
-                String = "TestString",
-                Enum = Gender.Female,
-                Boolean = true,
-                Integer = 98,
-                VerticalAlignment = VerticalAlignment.Stretch
+                String            = "TestString",
+                Enum              = Gender.Female,
+                Boolean           = true,
+                Integer           = 98,
+                VerticalAlignment = VerticalAlignment.Stretch,
+                FlattenedType     = new DemoDataModel {Index = 0, IsSelected = true, Name = "Flattened", Remark = "Remark", Type = DemoType.Type4}
             };
         }
 

src/Shared/HandyControl_Shared/Controls/Carousel/Carousel.cs

@@ -268,9 +268,16 @@ public void UpdatePageButtons(int index = -1)
         /// </summary>
         private void UpdateItemsPosition()
         {
-            if (!CheckNull()) return;
-            if (!_appliedTemplate) return;
-            if (Items.Count == 0) return;
+            if (!CheckNull() || !_appliedTemplate || Items.Count == 0)
+            {
+                return;
+            }
+
+            if (PageIndex == -1)
+            {
+                PageIndex = 0;
+            }
+
             if (!IsCenter)
             {
                 ItemsHost.BeginAnimation(MarginProperty,

src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/EnumPropertyEditor.cs

@@ -1,17 +1,66 @@
 using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Globalization;
+using System.Linq;
 using System.Windows;
 using System.Windows.Controls.Primitives;
+using System.Windows.Data;
 
 namespace HandyControl.Controls
 {
     public class EnumPropertyEditor : PropertyEditorBase
     {
-        public override FrameworkElement CreateElement(PropertyItem propertyItem) => new System.Windows.Controls.ComboBox
-        {
-            IsEnabled = !propertyItem.IsReadOnly,
-            ItemsSource = Enum.GetValues(propertyItem.PropertyType)
-        };
+        public override FrameworkElement CreateElement(PropertyItem propertyItem) =>
+            new System.Windows.Controls.ComboBox
+            {
+                IsEnabled   = !propertyItem.IsReadOnly,
+                ItemsSource = EnumPropertyEditor.GetEnumDescription(propertyItem.PropertyType)
+            };
 
         public override DependencyProperty GetDependencyProperty() => Selector.SelectedValueProperty;
+
+        protected override IValueConverter GetConverter(PropertyItem propertyItem) => new EnumDescriptionConverter(propertyItem.PropertyType);
+
+        private static IEnumerable<string> GetEnumDescription(Type enumType)
+        {
+            var values    = Enum.GetValues(enumType);
+            var enumDescs = new List<string>(values.Length);
+
+            enumDescs.AddRange(from object value in values
+                               select enumType.GetField(value.ToString())
+                               into field
+                               let attributes = field.GetCustomAttributes(typeof(DescriptionAttribute), false)
+                               select (attributes.Length == 0 ? field.Name : ((DescriptionAttribute) attributes[0]).Description));
+
+            return enumDescs;
+        }
+
+        private class EnumDescriptionConverter : IValueConverter
+        {
+            private readonly List<KeyValuePair<Enum, string>> cache;
+
+            public EnumDescriptionConverter(Type enumType)
+            {
+                var values = Enum.GetValues(enumType);
+
+                cache = new List<KeyValuePair<Enum, string>>(values.Length);
+
+                foreach (var value in values)
+                {
+                    var field      = enumType.GetField(value.ToString());
+                    var attributes = field.GetCustomAttributes(typeof(DescriptionAttribute), false);
+                    var fieldValue = (attributes.Length == 0 ? field.Name : ((DescriptionAttribute) attributes[0]).Description);
+
+                    cache.Add(new KeyValuePair<Enum, string>((Enum) value, fieldValue));
+                }
+            }
+
+            object IValueConverter.Convert(object value, Type targetType, object parameter, CultureInfo culture) =>
+                cache.FirstOrDefault(x => x.Key.Equals((Enum) value)).Value;
+
+            object IValueConverter.ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) =>
+                cache.FirstOrDefault(x => x.Value == (string) value).Key;
+        }
     }
 }

src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/PropertyEditorBase.cs

@@ -1,21 +1,28 @@
-using System.Windows;
+using System;
+using System.Reflection;
+using System.Windows;
+using System.Windows.Controls.Primitives;
 using System.Windows.Data;
+using HandyControl.Controls;
 
 namespace HandyControl.Controls
 {
+
     public abstract class PropertyEditorBase : DependencyObject
     {
         public abstract FrameworkElement CreateElement(PropertyItem propertyItem);
 
-        public virtual void CreateBinding(PropertyItem propertyItem, DependencyObject element) =>
+        public virtual void CreateBinding(PropertyItem propertyItem, DependencyObject element)
+        {
             BindingOperations.SetBinding(element, GetDependencyProperty(),
-                new Binding($"{propertyItem.PropertyName}")
-                {
-                    Source = propertyItem.Value,
-                    Mode = GetBindingMode(propertyItem),
-                    UpdateSourceTrigger = GetUpdateSourceTrigger(propertyItem),
-                    Converter = GetConverter(propertyItem)
-                });
+                                         new Binding($"{propertyItem.PropertyName}")
+                                         {
+                                             Source              = propertyItem.Value,
+                                             Mode                = GetBindingMode(propertyItem),
+                                             UpdateSourceTrigger = GetUpdateSourceTrigger(propertyItem),
+                                             Converter           = GetConverter(propertyItem)
+                                         });
+        }
 
         public abstract DependencyProperty GetDependencyProperty();