added two editors

src/Shared/HandyControl_Shared/Controls/Button/ButtonGroup.cs

@@ -1,7 +1,6 @@
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
-using HandyControl.Tools;
 
 namespace HandyControl.Controls
 {
@@ -18,15 +17,6 @@ namespace HandyControl.Controls
             set => SetValue(OrientationProperty, value);
         }
 
-        public static readonly DependencyProperty ItemStyleSelectorProperty = DependencyProperty.Register(
-            "ItemStyleSelector", typeof(StyleSelector), typeof(ButtonGroup), new PropertyMetadata(new ButtonGroupItemStyleSelector()));
-
-        public StyleSelector ItemStyleSelector
-        {
-            get => (StyleSelector)GetValue(ItemStyleSelectorProperty);
-            set => SetValue(ItemStyleSelectorProperty, value);
-        }
-
         protected override void OnVisualChildrenChanged(DependencyObject visualAdded, DependencyObject visualRemoved)
         {
             base.OnVisualChildrenChanged(visualAdded, visualRemoved);
@@ -35,7 +25,7 @@ namespace HandyControl.Controls
             for (var i = 0; i < count; i++)
             {
                 var item = (ButtonBase)Items[i];
-                item.Style = ItemStyleSelector?.SelectStyle(item, this);
+                item.Style = ItemContainerStyleSelector?.SelectStyle(item, this);
             }
         }
     }

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

@@ -0,0 +1,70 @@
+using System;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Media;
+using System.Windows.Shapes;
+using HandyControl.Tools;
+
+namespace HandyControl.Controls
+{
+    public class HorizontalAlignmentPropertyEditor : PropertyEditorBase
+    {
+        public override FrameworkElement CreateElement(PropertyItem propertyItem) => new System.Windows.Controls.ComboBox
+        {
+            Style = ResourceHelper.GetResource<Style>("ComboBoxCapsule"),
+            ItemsSource = Enum.GetValues(propertyItem.PropertyType),
+            ItemTemplateSelector = ResourceHelper.GetResource<DataTemplateSelector>("HorizontalAlignmentPathTemplateSelector"),
+            HorizontalAlignment = HorizontalAlignment.Left
+        };
+
+        public override DependencyProperty GetDependencyProperty() => Selector.SelectedValueProperty;
+    }
+
+    public class HorizontalAlignmentPathTemplateSelector : DataTemplateSelector
+    {
+        public override DataTemplate SelectTemplate(object item, DependencyObject container)
+        {
+            if (item is HorizontalAlignment horizontalAlignment)
+            {
+                var dataTemplate = new DataTemplate
+                {
+                    DataType = typeof(System.Windows.Controls.ComboBox)
+                };
+
+                var factory = new FrameworkElementFactory(typeof(Path));
+                factory.SetValue(FrameworkElement.WidthProperty, 12.0);
+                factory.SetValue(FrameworkElement.HeightProperty, 10.0);
+                factory.SetBinding(Shape.FillProperty, new Binding(Control.ForegroundProperty.Name)
+                {
+                    RelativeSource = new RelativeSource
+                    {
+                        AncestorType = typeof(ComboBoxItem)
+                    }
+                });
+
+                switch (horizontalAlignment)
+                {
+                    case HorizontalAlignment.Left:
+                        factory.SetValue(Path.DataProperty, ResourceHelper.GetResource<Geometry>("AlignLeftGeometry"));
+                        break;
+                    case HorizontalAlignment.Center:
+                        factory.SetValue(Path.DataProperty, ResourceHelper.GetResource<Geometry>("AlignHCenterGeometry"));
+                        break;
+                    case HorizontalAlignment.Right:
+                        factory.SetValue(Path.DataProperty, ResourceHelper.GetResource<Geometry>("AlignRightGeometry"));
+                        break;
+                    case HorizontalAlignment.Stretch:
+                        factory.SetValue(Path.DataProperty, ResourceHelper.GetResource<Geometry>("AlignHStretchGeometry"));
+                        break;
+                }
+
+                dataTemplate.VisualTree = factory;
+                return dataTemplate;
+            }
+
+            return null;
+        }
+    }
+}

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

@@ -3,11 +3,11 @@ using System.Windows.Data;
 
 namespace HandyControl.Controls
 {
-    public abstract class PropertyEditorBase : FrameworkElement
+    public abstract class PropertyEditorBase : DependencyObject
     {
         public abstract FrameworkElement CreateElement(PropertyItem propertyItem);
 
-        public virtual void CreateBinding(PropertyItem propertyItem, FrameworkElement element) =>
+        public virtual void CreateBinding(PropertyItem propertyItem, DependencyObject element) =>
             BindingOperations.SetBinding(element, GetDependencyProperty(),
                 new Binding($"({propertyItem.PropertyName})")
                 {

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

@@ -0,0 +1,70 @@
+using System;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Media;
+using System.Windows.Shapes;
+using HandyControl.Tools;
+
+namespace HandyControl.Controls
+{
+    public class VerticalAlignmentPropertyEditor : PropertyEditorBase
+    {
+        public override FrameworkElement CreateElement(PropertyItem propertyItem) => new System.Windows.Controls.ComboBox
+        {
+            Style = ResourceHelper.GetResource<Style>("ComboBoxCapsule"),
+            ItemsSource = Enum.GetValues(propertyItem.PropertyType),
+            ItemTemplateSelector = ResourceHelper.GetResource<DataTemplateSelector>("VerticalAlignmentPathTemplateSelector"),
+            HorizontalAlignment = HorizontalAlignment.Left
+        };
+
+        public override DependencyProperty GetDependencyProperty() => Selector.SelectedValueProperty;
+    }
+
+    public class VerticalAlignmentPathTemplateSelector : DataTemplateSelector
+    {
+        public override DataTemplate SelectTemplate(object item, DependencyObject container)
+        {
+            if (item is VerticalAlignment verticalAlignment)
+            {
+                var dataTemplate = new DataTemplate
+                {
+                    DataType = typeof(System.Windows.Controls.ComboBox)
+                };
+
+                var factory = new FrameworkElementFactory(typeof(Path));
+                factory.SetValue(FrameworkElement.WidthProperty, 10.0);
+                factory.SetValue(FrameworkElement.HeightProperty, 12.0);
+                factory.SetBinding(Shape.FillProperty, new Binding(Control.ForegroundProperty.Name)
+                {
+                    RelativeSource = new RelativeSource
+                    {
+                        AncestorType = typeof(ComboBoxItem)
+                    }
+                });
+
+                switch (verticalAlignment)
+                {
+                    case VerticalAlignment.Top:
+                        factory.SetValue(Path.DataProperty, ResourceHelper.GetResource<Geometry>("AlignTopGeometry"));
+                        break;
+                    case VerticalAlignment.Center:
+                        factory.SetValue(Path.DataProperty, ResourceHelper.GetResource<Geometry>("AlignVCenterGeometry"));
+                        break;
+                    case VerticalAlignment.Bottom:
+                        factory.SetValue(Path.DataProperty, ResourceHelper.GetResource<Geometry>("AlignBottomGeometry"));
+                        break;
+                    case VerticalAlignment.Stretch:
+                        factory.SetValue(Path.DataProperty, ResourceHelper.GetResource<Geometry>("AlignVStretchGeometry"));
+                        break;
+                }
+
+                dataTemplate.VisualTree = factory;
+                return dataTemplate;
+            }
+
+            return null;
+        }
+    }
+}

src/Shared/HandyControl_Shared/Controls/PropertyGrid/PropertyResolver.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
+using System.Windows;
 using HandyControl.Properties.Langs;
 
 namespace HandyControl.Controls
@@ -22,18 +23,20 @@ namespace HandyControl.Controls
             [typeof(float)] = EditorTypeCode.SingleNumber,
             [typeof(double)] = EditorTypeCode.DoubleNumber,
             [typeof(bool)] = EditorTypeCode.Switch,
-            [typeof(DateTime)] = EditorTypeCode.DateTime
+            [typeof(DateTime)] = EditorTypeCode.DateTime,
+            [typeof(HorizontalAlignment)] = EditorTypeCode.HorizontalAlignment,
+            [typeof(VerticalAlignment)] = EditorTypeCode.VerticalAlignment
         };
 
         public string ResolveCategory(PropertyDescriptor propertyDescriptor)
         {
-            var category = propertyDescriptor.Category;
-            if (string.IsNullOrEmpty(category))
-            {
-                category = Lang.Miscellaneous;
-            }
+            var categoryAttribute = propertyDescriptor.Attributes.OfType<CategoryAttribute>().FirstOrDefault();
 
-            return category;
+            return categoryAttribute == null ? 
+                Lang.Miscellaneous :
+                string.IsNullOrEmpty(categoryAttribute.Category) ? 
+                    Lang.Miscellaneous : 
+                    categoryAttribute.Category;
         }
 
         public string ResolveDisplayName(PropertyDescriptor propertyDescriptor)
@@ -88,6 +91,8 @@ namespace HandyControl.Controls
                     EditorTypeCode.DoubleNumber => new NumberPropertyEditor(double.MinValue, double.MaxValue),
                     EditorTypeCode.Switch => new SwitchPropertyEditor(),
                     EditorTypeCode.DateTime => new DateTimePropertyEditor(),
+                    EditorTypeCode.HorizontalAlignment => new HorizontalAlignmentPropertyEditor(),
+                    EditorTypeCode.VerticalAlignment => new VerticalAlignmentPropertyEditor(),
                     _ => new ReadOnlyTextPropertyEditor()
                 }
                 : type.IsSubclassOf(typeof(Enum))
@@ -110,7 +115,9 @@ namespace HandyControl.Controls
             SingleNumber,
             DoubleNumber,
             Switch,
-            DateTime
+            DateTime,
+            HorizontalAlignment,
+            VerticalAlignment
         }
     }
 }

src/Shared/HandyControl_Shared/Controls/Window/BlurWindow.cs

@@ -1,5 +1,4 @@
 using System.Runtime.InteropServices;
-using System.Windows;
 using System.Windows.Media;
 using HandyControl.Data;
 using HandyControl.Tools;
@@ -9,11 +8,6 @@ namespace HandyControl.Controls
 {
     public class BlurWindow : Window
     {
-        static BlurWindow()
-        {
-            StyleProperty.OverrideMetadata(typeof(BlurWindow), new FrameworkPropertyMetadata(ResourceHelper.GetResource<Style>(ResourceToken.WindowBlur)));
-        }
-
         public override void OnApplyTemplate()
         {
             base.OnApplyTemplate();

src/Shared/HandyControl_Shared/Controls/Window/GlowWindow.cs

@@ -48,12 +48,6 @@ namespace HandyControl.Controls
             set => SetValue(InactiveGlowColorProperty, value);
         }
 
-        static GlowWindow()
-        {
-            StyleProperty.OverrideMetadata(typeof(GlowWindow), new FrameworkPropertyMetadata(ResourceHelper.GetResource<Style>(ResourceToken.WindowGlow)));
-            ResizeModeProperty.OverrideMetadata(typeof(GlowWindow), new FrameworkPropertyMetadata(OnResizeModeChanged));
-        }
-
         #region internal
 
         internal void EndDeferGlowChanges()