Merge pull request #172 from HandyOrg/add-SplitButton

Add split button

src/Shared/HandyControl_Shared/Controls/Block/FloatingBlock.cs

@@ -101,13 +101,13 @@ namespace HandyControl.Controls
         {
             if (!(d is UIElement target)) return;
 
-            target.RemoveHandler(PreviewMouseLeftButtonDownEvent, new MouseButtonEventHandler(Target_PreviewMouseLeftButtonDown));
-            target.RemoveHandler(PreviewMouseLeftButtonUpEvent, new MouseButtonEventHandler(Target_PreviewMouseLeftButtonUp));
+            target.PreviewMouseLeftButtonDown -= Target_PreviewMouseLeftButtonDown;
+            target.PreviewMouseLeftButtonUp -= Target_PreviewMouseLeftButtonUp;
 
             if (e.NewValue != null)
             {
-                target.AddHandler(PreviewMouseLeftButtonDownEvent, new MouseButtonEventHandler(Target_PreviewMouseLeftButtonDown));
-                target.AddHandler(PreviewMouseLeftButtonUpEvent, new MouseButtonEventHandler(Target_PreviewMouseLeftButtonUp));
+                target.PreviewMouseLeftButtonDown += Target_PreviewMouseLeftButtonDown;
+                target.PreviewMouseLeftButtonUp += Target_PreviewMouseLeftButtonUp;
             }
         }
 

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

@@ -0,0 +1,81 @@
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Input;
+using HandyControl.Data;
+using HandyControl.Data.Enum;
+
+namespace HandyControl.Controls
+{
+    public class SplitButton : ButtonBase
+    {
+        public static readonly DependencyProperty HitModeProperty = DependencyProperty.Register(
+            "HitMode", typeof(MouseHitMode), typeof(SplitButton), new PropertyMetadata(default(MouseHitMode)));
+
+        public MouseHitMode HitMode
+        {
+            get => (MouseHitMode) GetValue(HitModeProperty);
+            set => SetValue(HitModeProperty, value);
+        }
+
+        public static readonly DependencyProperty MaxDropDownHeightProperty = DependencyProperty.Register(
+            "MaxDropDownHeight", typeof(double), typeof(SplitButton), new PropertyMetadata(SystemParameters.PrimaryScreenHeight / 3.0));
+
+        public double MaxDropDownHeight
+        {
+            get => (double) GetValue(MaxDropDownHeightProperty);
+            set => SetValue(MaxDropDownHeightProperty, value);
+        }
+
+        public static readonly DependencyProperty IsDropDownOpenProperty = DependencyProperty.Register(
+            "IsDropDownOpen", typeof(bool), typeof(SplitButton), new PropertyMetadata(ValueBoxes.FalseBox));
+
+        public bool IsDropDownOpen
+        {
+            get => (bool) GetValue(IsDropDownOpenProperty);
+            set => SetValue(IsDropDownOpenProperty, value);
+        }
+
+        public static readonly DependencyProperty DropDownContentProperty = DependencyProperty.Register(
+            "DropDownContent", typeof(object), typeof(SplitButton), new PropertyMetadata(default(object)));
+
+        public object DropDownContent
+        {
+            get => GetValue(DropDownContentProperty);
+            set => SetValue(DropDownContentProperty, value);
+        }
+
+        public SplitButton()
+        {
+            AddHandler(MenuItem.ClickEvent, new RoutedEventHandler(ItemsOnClick));
+        }
+
+        private void ItemsOnClick(object sender, RoutedEventArgs e)
+        {
+            if (e.OriginalSource is MenuItem)
+            {
+                SetCurrentValue(IsDropDownOpenProperty, ValueBoxes.FalseBox);
+            }
+        }
+
+        protected override void OnPreviewMouseLeftButtonDown(MouseButtonEventArgs e)
+        {
+            base.OnPreviewMouseLeftButtonDown(e);
+
+            if (HitMode == MouseHitMode.Hover)
+            {
+                e.Handled = true;
+            }
+        }
+
+        protected override void OnMouseEnter(MouseEventArgs e)
+        {
+            base.OnMouseEnter(e);
+
+            if (HitMode == MouseHitMode.Hover)
+            {
+                SetCurrentValue(IsDropDownOpenProperty, ValueBoxes.TrueBox);
+            }
+        }
+    }
+}

src/Shared/HandyControl_Shared/Controls/Input/DateTimePicker.cs

@@ -147,7 +147,6 @@ namespace HandyControl.Controls
                         dp._calendarWithClock.Focus();
                     });
                 }
-
             }
         }
 

src/Shared/HandyControl_Shared/Controls/Other/TransitioningContentControl.cs

@@ -4,6 +4,7 @@ using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Markup;
 using System.Windows.Media.Animation;
 using HandyControl.Data;
 using HandyControl.Tools;
@@ -14,7 +15,8 @@ namespace HandyControl.Controls
     [TemplateVisualState(GroupName = PresentationGroup, Name = DefaultTransitionState)]
     [TemplatePart(Name = PreviousContentPresentationSitePartName, Type = typeof(ContentControl))]
     [TemplatePart(Name = CurrentContentPresentationSitePartName, Type = typeof(ContentControl))]
-    public class TransitioningContentControl : ContentControl
+    [ContentProperty("Content")]
+    public class TransitioningContentControl : Control
     {
         private Storyboard _currentTransition;
 
@@ -76,11 +78,28 @@ namespace HandyControl.Controls
             VisualStateManager.GoToState(this, Transition, true);
         }
 
-        protected override void OnContentChanged(object oldContent, object newContent)
-        {
-            base.OnContentChanged(oldContent, newContent);
+        public static readonly DependencyProperty ContentProperty = DependencyProperty.Register(
+            "Content", typeof(object), typeof(TransitioningContentControl), new PropertyMetadata(default(object), OnContentChanged));
 
-            StartTransition(oldContent, newContent);
+        private static void OnContentChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            var ctl = (TransitioningContentControl) d;
+            ctl.StartTransition(e.OldValue, e.NewValue);
+        }
+
+        public static readonly DependencyProperty ContentTemplateProperty = DependencyProperty.Register(
+            "ContentTemplate", typeof(DataTemplate), typeof(TransitioningContentControl), new PropertyMetadata(default(DataTemplate)));
+
+        public DataTemplate ContentTemplate
+        {
+            get => (DataTemplate) GetValue(ContentTemplateProperty);
+            set => SetValue(ContentTemplateProperty, value);
+        }
+
+        public object Content
+        {
+            get => GetValue(ContentProperty);
+            set => SetValue(ContentProperty, value);
         }
 
         [SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "newContent", Justification = "Should be used in the future.")]

src/Shared/HandyControl_Shared/Controls/Rate/Rate.cs

@@ -132,11 +132,8 @@ namespace HandyControl.Controls
             set => SetValue(IsReadOnlyProperty, value);
         }
 
-        private void RateItemValueChanged(object sender, RoutedEventArgs e)
-        {
-            Value =
-                (from RateItem item in Items where item.IsSelected select item.IsHalf ? 0.5 : 1).Sum();
-        }
+        private void RateItemValueChanged(object sender, RoutedEventArgs e) =>
+            Value = (from RateItem item in Items where item.IsSelected select item.IsHalf ? 0.5 : 1).Sum();
 
         private void RateItemSelectedChanged(object sender, RoutedEventArgs e)
         {
@@ -163,15 +160,9 @@ namespace HandyControl.Controls
             }
         }
 
-        protected override bool IsItemItsOwnContainerOverride(object item)
-        {
-            return item is RateItem;
-        }
+        protected override bool IsItemItsOwnContainerOverride(object item) => item is RateItem;
 
-        protected override DependencyObject GetContainerForItemOverride()
-        {
-            return new RateItem();
-        }
+        protected override DependencyObject GetContainerForItemOverride() => new RateItem();
 
         private void OnApplyTemplateInternal()
         {
@@ -242,9 +233,6 @@ namespace HandyControl.Controls
             }
         }
 
-        public void Reset()
-        {
-            Value = DefaultValue;
-        }
+        public void Reset() => Value = DefaultValue;
     }
 }