Synchronize the Net40

Net40/HandyControl_Net40/Controls/Attach/IconElement.cs

@@ -1,6 +1,5 @@
 using System.Windows;
 using System.Windows.Media;
-using HandyControl.Data;
 
 namespace HandyControl.Controls
 {

Net40/HandyControl_Net40/Controls/Base/SelectableItem.cs

@@ -29,11 +29,38 @@ namespace HandyControl.Controls
 
             if (_isMouseLeftButtonDown)
             {
-                RaiseEvent(new RoutedEventArgs(SelectedEvent, this));
+                if (SelfManage)
+                {
+                    if (!IsSelected)
+                    {
+                        IsSelected = true;
+                        OnSelected(new RoutedEventArgs(SelectedEvent, this));
+                    }
+                    else if (CanDeselect)
+                    {
+                        IsSelected = false;
+                        OnSelected(new RoutedEventArgs(DeselectedEvent, this));
+                    }
+                }
+                else
+                {
+                    if (CanDeselect)
+                    {
+                        OnSelected(IsSelected
+                            ? new RoutedEventArgs(DeselectedEvent, this)
+                            : new RoutedEventArgs(SelectedEvent, this));
+                    }
+                    else
+                    {
+                        OnSelected(new RoutedEventArgs(SelectedEvent, this));
+                    }
+                }
                 _isMouseLeftButtonDown = false;
             }
         }
 
+        protected virtual void OnSelected(RoutedEventArgs e) => RaiseEvent(e);
+
         public static readonly DependencyProperty IsSelectedProperty = DependencyProperty.Register(
             "IsSelected", typeof(bool), typeof(SelectableItem), new PropertyMetadata(ValueBoxes.FalseBox));
 
@@ -43,6 +70,24 @@ namespace HandyControl.Controls
             set => SetValue(IsSelectedProperty, value);
         }
 
+        public static readonly DependencyProperty SelfManageProperty = DependencyProperty.Register(
+            "SelfManage", typeof(bool), typeof(SelectableItem), new PropertyMetadata(ValueBoxes.FalseBox));
+
+        public bool SelfManage
+        {
+            get => (bool)GetValue(SelfManageProperty);
+            set => SetValue(SelfManageProperty, value);
+        }
+
+        public static readonly DependencyProperty CanDeselectProperty = DependencyProperty.Register(
+            "CanDeselect", typeof(bool), typeof(SelectableItem), new PropertyMetadata(ValueBoxes.FalseBox));
+
+        public bool CanDeselect
+        {
+            get => (bool)GetValue(CanDeselectProperty);
+            set => SetValue(CanDeselectProperty, value);
+        }
+
         public static readonly RoutedEvent SelectedEvent =
             EventManager.RegisterRoutedEvent("Selected", RoutingStrategy.Bubble,
                 typeof(RoutedEventHandler), typeof(SelectableItem));
@@ -52,5 +97,15 @@ namespace HandyControl.Controls
             add => AddHandler(SelectedEvent, value);
             remove => RemoveHandler(SelectedEvent, value);
         }
+
+        public static readonly RoutedEvent DeselectedEvent =
+            EventManager.RegisterRoutedEvent("Deselected", RoutingStrategy.Bubble,
+                typeof(RoutedEventHandler), typeof(SelectableItem));
+
+        public event RoutedEventHandler Deselected
+        {
+            add => AddHandler(DeselectedEvent, value);
+            remove => RemoveHandler(DeselectedEvent, value);
+        }
     }
 }

Net40/HandyControl_Net40/Controls/Base/SimpleItemsControl.cs

@@ -1,4 +1,5 @@
-using System.Collections.ObjectModel;
+using System.Collections;
+using System.Collections.ObjectModel;
 using System.Collections.Specialized;
 using System.ComponentModel;
 using System.Windows;
@@ -25,25 +26,35 @@ namespace HandyControl.Controls
             "ItemContainerStyle", typeof(Style), typeof(SimpleItemsControl),
             new PropertyMetadata(default(Style), OnItemContainerStyleChanged));
 
+        public static readonly DependencyProperty ItemsSourceProperty = DependencyProperty.Register(
+            "ItemsSource", typeof(IEnumerable), typeof(SimpleItemsControl),
+            new PropertyMetadata(default(IEnumerable), OnItemsSourceChanged));
+
         public SimpleItemsControl()
         {
             var items = new ObservableCollection<object>();
-            items.CollectionChanged += OnItemsCollectionChanged;
+            items.CollectionChanged += OnItemsChanged;
             Items = items;
         }
 
+        public IEnumerable ItemsSource
+        {
+            get => (IEnumerable)GetValue(ItemsSourceProperty);
+            set => SetValue(ItemsSourceProperty, value);
+        }
+
         [Bindable(true)]
         [Category("Content")]
         public Style ItemContainerStyle
         {
-            get => (Style) GetValue(ItemContainerStyleProperty);
+            get => (Style)GetValue(ItemContainerStyleProperty);
             set => SetValue(ItemContainerStyleProperty, value);
         }
 
         [Bindable(true)]
         public DataTemplate ItemTemplate
         {
-            get => (DataTemplate) GetValue(ItemTemplateProperty);
+            get => (DataTemplate)GetValue(ItemTemplateProperty);
             set => SetValue(ItemTemplateProperty, value);
         }
 
@@ -53,6 +64,15 @@ namespace HandyControl.Controls
 
         internal Panel ItemsHost { get; set; }
 
+        private static void OnItemsSourceChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            ((SimpleItemsControl)d).OnItemsSourceChanged((IEnumerable)e.OldValue, (IEnumerable)e.NewValue);
+        }
+
+        protected virtual void OnItemsSourceChanged(IEnumerable oldValue, IEnumerable newValue)
+        {
+        }
+
         public override void OnApplyTemplate()
         {
             ItemsHost?.Children.Clear();
@@ -63,7 +83,7 @@ namespace HandyControl.Controls
             Refresh();
         }
 
-        private void OnItemsCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+        protected virtual void OnItemsChanged(object sender, NotifyCollectionChangedEventArgs e)
         {
             Refresh();
             UpdateItems();
@@ -89,16 +109,14 @@ namespace HandyControl.Controls
         }
 
         private static void OnItemTemplateChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            var target = d as SimpleItemsControl;
-            target?.Refresh();
-        }
+            => (d as SimpleItemsControl)?.OnItemTemplateChanged(e);
+
+        protected virtual void OnItemTemplateChanged(DependencyPropertyChangedEventArgs e) => Refresh();
 
         private static void OnItemContainerStyleChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            var target = d as SimpleItemsControl;
-            target?.Refresh();
-        }
+            => (d as SimpleItemsControl)?.OnItemContainerStyleChanged(e);
+
+        protected virtual void OnItemContainerStyleChanged(DependencyPropertyChangedEventArgs e) => Refresh();
 
         protected virtual void Refresh()
         {
@@ -128,7 +146,6 @@ namespace HandyControl.Controls
 
         protected virtual void UpdateItems()
         {
-
         }
     }
 }

Net40/HandyControl_Net40/Controls/Button/ProgressButton.cs

@@ -0,0 +1,27 @@
+using System.Windows;
+using System.Windows.Controls.Primitives;
+using HandyControl.Data;
+
+namespace HandyControl.Controls
+{
+    public class ProgressButton : ToggleButton
+    {
+        public static readonly DependencyProperty ProgressStyleProperty = DependencyProperty.Register(
+            "ProgressStyle", typeof(Style), typeof(ProgressButton), new PropertyMetadata(default(Style)));
+
+        public Style ProgressStyle
+        {
+            get => (Style) GetValue(ProgressStyleProperty);
+            set => SetValue(ProgressStyleProperty, value);
+        }
+
+        public static readonly DependencyProperty ProgressProperty = DependencyProperty.Register(
+            "Progress", typeof(double), typeof(ProgressButton), new PropertyMetadata(ValueBoxes.Double0Box));
+
+        public double Progress
+        {
+            get => (double) GetValue(ProgressProperty);
+            set => SetValue(ProgressProperty, value);
+        }
+    }
+}

Net40/HandyControl_Net40/Controls/Cover/CoverFlow/CoverFlow.cs

@@ -0,0 +1,305 @@
+using System;
+using System.Collections.Generic;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using HandyControl.Data;
+
+namespace HandyControl.Controls
+{
+    /// <summary>
+    ///     封面流
+    /// </summary>
+    [TemplatePart(Name = ElementViewport3D, Type = typeof(Viewport3D))]
+    [TemplatePart(Name = ElementCamera, Type = typeof(ProjectionCamera))]
+    [TemplatePart(Name = ElementVisualParent, Type = typeof(ModelVisual3D))]
+    public class CoverFlow : Control
+    {
+        private const string ElementViewport3D = "PART_Viewport3D";
+
+        private const string ElementCamera = "PART_Camera";
+
+        private const string ElementVisualParent = "PART_VisualParent";
+
+        /// <summary>
+        ///     最大显示数量的一半
+        /// </summary>
+        private const int MaxShowCountHalf = 7;
+
+        /// <summary>
+        ///     页码
+        /// </summary>
+        public static readonly DependencyProperty PageIndexProperty = DependencyProperty.Register(
+            "PageIndex", typeof(int), typeof(CoverFlow),
+            new PropertyMetadata(ValueBoxes.Int0Box, OnPageIndexChanged, CoercePageIndex));
+
+        private static object CoercePageIndex(DependencyObject d, object baseValue)
+        {
+            var ctl = (CoverFlow)d;
+            var v = (int)baseValue;
+
+            if (v < 0)
+            {
+                return 0;
+            }
+            if (v >= ctl._uriList.Count)
+            {
+                return ctl._uriList.Count - 1;
+            }
+            return v;
+        }
+
+        private static void OnPageIndexChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            var ctl = (CoverFlow)d;
+            ctl.UpdateIndex((int)e.NewValue, (int)e.OldValue);
+        }
+
+        /// <summary>
+        ///     是否循环
+        /// </summary>
+        public static readonly DependencyProperty LoopProperty = DependencyProperty.Register(
+            "Loop", typeof(bool), typeof(CoverFlow), new PropertyMetadata(ValueBoxes.FalseBox));
+
+        /// <summary>
+        ///     存储所有的资源标识符
+        /// </summary>
+        private readonly Dictionary<int, Uri> _uriList = new Dictionary<int, Uri>();
+
+        /// <summary>
+        ///     当前在显示范围内的项
+        /// </summary>
+        private readonly Dictionary<int, CoverFlowItem> _itemShowList = new Dictionary<int, CoverFlowItem>();
+
+        /// <summary>
+        ///     相机
+        /// </summary>
+        private ProjectionCamera _camera;
+
+        /// <summary>
+        ///     3d画布
+        /// </summary>
+        private Viewport3D _viewport3D;
+
+        /// <summary>
+        ///     项容器
+        /// </summary>
+        private ModelVisual3D _visualParent;
+
+        /// <summary>
+        ///     显示范围内第一个项的编号
+        /// </summary>
+        private int _firstShowIndex;
+
+        /// <summary>
+        ///     显示范围内最后一个项的编号
+        /// </summary>
+        private int _lastShowIndex;
+
+        /// <summary>
+        ///     跳转编号
+        /// </summary>
+        private int _jumpToIndex = -1;
+
+        /// <summary>
+        ///     页码
+        /// </summary>
+        public int PageIndex
+        {
+            get => (int)GetValue(PageIndexProperty);
+            internal set => SetValue(PageIndexProperty, value);
+        }
+
+        /// <summary>
+        ///     是否循环
+        /// </summary>
+        public bool Loop
+        {
+            get => (bool)GetValue(LoopProperty);
+            set => SetValue(LoopProperty, value);
+        }
+
+        public override void OnApplyTemplate()
+        {
+            if (_viewport3D != null)
+            {
+                _viewport3D.Children.Clear();
+                _itemShowList.Clear();
+                _viewport3D.MouseLeftButtonDown -= Viewport3D_MouseLeftButtonDown;
+            }
+
+            base.OnApplyTemplate();
+
+            _viewport3D = GetTemplateChild(ElementViewport3D) as Viewport3D;
+            if (_viewport3D != null)
+            {
+                _viewport3D.MouseLeftButtonDown += Viewport3D_MouseLeftButtonDown;
+            }
+
+            _camera = GetTemplateChild(ElementCamera) as ProjectionCamera;
+            _visualParent = GetTemplateChild(ElementVisualParent) as ModelVisual3D;
+
+            UpdateShowRange();
+            if (_jumpToIndex > 0)
+            {
+                PageIndex = _jumpToIndex;
+                _jumpToIndex = -1;
+            }
+            _camera.Position = new Point3D(CoverFlowItem.Interval * PageIndex, _camera.Position.Y, _camera.Position.Z);
+        }
+
+        /// <summary>
+        ///     批量添加资源
+        /// </summary>
+        /// <param name="uriList"></param>
+        public void AddRange(List<Uri> uriList)
+        {
+            foreach (var uri in uriList)
+            {
+                _uriList.Add(_uriList.Count, uri);
+            }
+        }
+
+        /// <summary>
+        ///     添加一项资源
+        /// </summary>
+        /// <param name="uriString"></param>
+        public void Add(string uriString) => _uriList.Add(_uriList.Count, new Uri(uriString));
+
+        /// <summary>
+        ///     添加一项资源
+        /// </summary>
+        /// <param name="uri"></param>
+        public void Add(Uri uri) => _uriList.Add(_uriList.Count, uri);
+
+        /// <summary>
+        ///     跳转
+        /// </summary>
+        public void JumpTo(int index) => _jumpToIndex = index;
+
+        protected override void OnMouseWheel(MouseWheelEventArgs e)
+        {
+            base.OnMouseWheel(e);
+
+            if (e.Delta < 0)
+            {
+                var index = PageIndex + 1;
+                PageIndex = index >= _uriList.Count ? (Loop ? 0 : _uriList.Count - 1) : index;
+            }
+            else
+            {
+                var index = PageIndex - 1;
+                PageIndex = index < 0 ? (Loop ? _uriList.Count - 1 : 0) : index;
+            }
+        }
+
+        /// <summary>
+        ///     删除指定位置的项
+        /// </summary>
+        /// <param name="pos"></param>
+        private void Remove(int pos)
+        {
+            var item = _itemShowList[pos];
+            _visualParent.Children.Remove(item);
+            _itemShowList.Remove(pos);
+        }
+
+        /// <summary>
+        ///     移动项到指定的位置
+        /// </summary>
+        /// <param name="index"></param>
+        /// <param name="animated"></param>
+        private void Move(int index, bool animated) => _itemShowList[index].Move(PageIndex, animated);
+
+        private void Viewport3D_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+        {
+            var result = (RayMeshGeometry3DHitTestResult)VisualTreeHelper.HitTest(_viewport3D, e.GetPosition(_viewport3D));
+            if (result != null)
+            {
+                foreach (var item in _itemShowList.Values)
+                {
+                    if (item.HitTest(result.MeshHit))
+                    {
+                        PageIndex = item.Index;
+                        break;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        ///     更新项的位置
+        /// </summary>
+        /// <param name="newIndex"></param>
+        /// <param name="oldIndex"></param>
+        private void UpdateIndex(int newIndex, int oldIndex)
+        {
+            var animate = Math.Abs(newIndex - oldIndex) < MaxShowCountHalf;
+            UpdateShowRange();
+            if (newIndex > oldIndex)
+            {
+                if (oldIndex < _firstShowIndex)
+                {
+                    oldIndex = _firstShowIndex;
+                }
+                for (var i = oldIndex; i <= newIndex; i++)
+                {
+                    Move(i, animate);
+                }
+            }
+            else
+            {
+                if (oldIndex > _lastShowIndex)
+                {
+                    oldIndex = _lastShowIndex;
+                }
+                for (var i = oldIndex; i >= newIndex; i--)
+                {
+                    Move(i, animate);
+                }
+            }
+            _camera.Position = new Point3D(CoverFlowItem.Interval * newIndex, _camera.Position.Y,
+                _camera.Position.Z);
+        }
+
+        /// <summary>
+        ///     更新显示范围
+        /// </summary>
+        private void UpdateShowRange()
+        {
+            var newFirstShowIndex = Math.Max(PageIndex - MaxShowCountHalf, 0);
+            var newLastShowIndex = Math.Min(PageIndex + MaxShowCountHalf, _uriList.Count - 1);
+
+            if (_firstShowIndex < newFirstShowIndex)
+            {
+                for (var i = _firstShowIndex; i < newFirstShowIndex; i++)
+                {
+                    Remove(i);
+                }
+            }
+            else if (newLastShowIndex < _lastShowIndex)
+            {
+                for (var i = newLastShowIndex; i < _lastShowIndex; i++)
+                {
+                    Remove(i);
+                }
+            }
+
+            for (var i = newFirstShowIndex; i <= newLastShowIndex; i++)
+            {
+                if (!_itemShowList.ContainsKey(i))
+                {
+                    var cover = new CoverFlowItem(i, PageIndex, BitmapFrame.Create(_uriList[i]));
+                    _itemShowList[i] = cover;
+                    _visualParent.Children.Add(cover);
+                }
+            }
+
+            _firstShowIndex = newFirstShowIndex;
+            _lastShowIndex = newLastShowIndex;
+        }
+    }
+}

Net40/HandyControl_Net40/Controls/Cover/CoverFlow/CoverFlowItem.cs

@@ -0,0 +1,165 @@
+using System;
+using System.Windows;
+using System.Windows.Media;
+using System.Windows.Media.Media3D;
+using HandyControl.Tools;
+
+namespace HandyControl.Controls
+{
+    public class CoverFlowItem : ModelVisual3D
+    {
+        internal static readonly double Interval = .2;
+
+        internal static readonly double AnimationSpeed = 400;
+
+        private readonly AxisAngleRotation3D _rotation3D;
+
+        private readonly TranslateTransform3D _transform3D;
+
+        private readonly Model3DGroup _model3DGroup;
+
+        private readonly ImageSource _source;
+
+        internal int Index { get; set; }
+
+        public CoverFlowItem(int itemIndex, int currentIndex, ImageSource source)
+        {
+            Index = itemIndex;
+            _source = source;
+
+            _rotation3D = new AxisAngleRotation3D(new Vector3D(0, 1, 0), GetAngleByPos(currentIndex));
+            _transform3D = new TranslateTransform3D(GetXByPos(currentIndex), 0, GetZByPos(currentIndex));
+
+            var transformGroup = new Transform3DGroup();
+            transformGroup.Children.Add(new RotateTransform3D(_rotation3D));
+            transformGroup.Children.Add(_transform3D);
+
+            _model3DGroup = new Model3DGroup();
+            _model3DGroup.Children.Add(new GeometryModel3D(CreateItemGeometry(), new DiffuseMaterial(new ImageBrush(_source))));
+            _model3DGroup.Transform = transformGroup;
+
+            Content = _model3DGroup;
+        }
+
+        /// <summary>
+        ///     创建网格形状
+        /// </summary>
+        /// <param name="p0"></param>
+        /// <param name="p1"></param>
+        /// <param name="p2"></param>
+        /// <param name="p3"></param>
+        /// <returns></returns>
+        private static MeshGeometry3D CreateMeshGeometry(Point3D p0, Point3D p1, Point3D p2, Point3D p3)
+        {
+            var positions = new Point3DCollection
+            {
+                p0,
+                p1,
+                p2,
+                p3
+            };
+
+            var triangleIndices = new Int32Collection
+            {
+                0,
+                1,
+                2,
+                2,
+                3,
+                0
+            };
+
+            var textureCoordinates = new PointCollection
+            {
+                new Point(0, 1),
+                new Point(1, 1),
+                new Point(1, 0),
+                new Point(0, 0),
+                new Point(1, 0),
+                new Point(1, 1)
+            };
+
+            var normals = new Vector3DCollection
+            {
+                ArithmeticHelper.CalNormal(p0, p1, p2),
+                ArithmeticHelper.CalNormal(p2, p3, p0)
+            };
+
+            var geometry3D = new MeshGeometry3D
+            {
+                Positions = positions,
+                TriangleIndices = triangleIndices,
+                TextureCoordinates = textureCoordinates,
+                Normals = normals
+            };
+
+            geometry3D.Freeze();
+            return geometry3D;
+        }
+
+        /// <summary>
+        ///     创建内容形状
+        /// </summary>
+        /// <returns></returns>
+        private Geometry3D CreateItemGeometry()
+        {
+            var sx = _source.Width > _source.Height ? 0 : 1 - _source.Width / _source.Height;
+            var sy = _source.Width < _source.Height ? 0 : 1 - _source.Height / _source.Width;
+
+            var p0 = new Point3D(-1 + sx, -1 + sy, 0);
+            var p1 = new Point3D(1 - sx, -1 + sy, 0);
+            var p2 = new Point3D(1 - sx, 1 - sy, 0);
+            var p3 = new Point3D(-1 + sx, 1 - sy, 0);
+
+            return CreateMeshGeometry(p0, p1, p2, p3);
+        }
+
+        private double GetAngleByPos(int index) => Math.Sign(Index - index) * -90;
+
+        private double GetXByPos(int index) => Index * Interval + Math.Sign(Index - index) * 1.5;
+
+        private double GetZByPos(int index) => Index == index ? 1 : 0;
+
+        /// <summary>
+        ///     移动
+        /// </summary>
+        internal void Move(int currentIndex, bool animated)
+        {
+            if (animated || _rotation3D.HasAnimatedProperties)
+            {
+                _rotation3D.BeginAnimation(AxisAngleRotation3D.AngleProperty,
+                    AnimationHelper.CreateAnimation(GetAngleByPos(currentIndex), AnimationSpeed));
+                _transform3D.BeginAnimation(TranslateTransform3D.OffsetXProperty,
+                    AnimationHelper.CreateAnimation(GetXByPos(currentIndex), AnimationSpeed));
+                _transform3D.BeginAnimation(TranslateTransform3D.OffsetZProperty,
+                    AnimationHelper.CreateAnimation(GetZByPos(currentIndex), AnimationSpeed));
+            }
+            else
+            {
+                _rotation3D.Angle = GetAngleByPos(currentIndex);
+                _transform3D.OffsetX = GetXByPos(currentIndex);
+                _transform3D.OffsetZ = GetZByPos(currentIndex);
+            }
+        }
+
+        /// <summary>
+        ///     命中测试
+        /// </summary>
+        /// <param name="mesh"></param>
+        /// <returns></returns>
+        internal bool HitTest(MeshGeometry3D mesh)
+        {
+            foreach (var item in _model3DGroup.Children)
+            {
+                if (item is GeometryModel3D geometryModel3D)
+                {
+                    if (Equals(geometryModel3D.Geometry, mesh))
+                    {
+                        return true;
+                    }
+                }
+            }
+            return false;
+        }
+    }
+}

Net40/HandyControl_Net40/Controls/Cover/CoverView/CoverView.cs

@@ -0,0 +1,216 @@
+using System.Windows;
+using System.Windows.Data;
+using HandyControl.Data;
+using HandyControl.Tools;
+
+namespace HandyControl.Controls
+{
+    public class CoverView : RegularItemsControl
+    {
+        private readonly CoverViewContent _viewContent;
+
+        private CoverViewItem _selectedItem;
+
+        public CoverView()
+        {
+            _viewContent = new CoverViewContent();
+
+            AddHandler(SelectableItem.SelectedEvent, new RoutedEventHandler(CoverViewItem_OnSelected));
+            _viewContent.SetBinding(CoverViewContent.ContentHeightProperty, new Binding(ItemContentHeightProperty.Name) { Source = this });
+            _viewContent.SetBinding(WidthProperty, new Binding(ActualWidthProperty.Name) { Source = this });
+        }
+
+        private void CoverViewItem_OnSelected(object sender, RoutedEventArgs e)
+        {
+            if (e.OriginalSource is CoverViewItem item)
+            {
+                if (_selectedItem == null)
+                {
+                    item.IsSelected = true;
+                    _selectedItem = item;
+                    if (_viewContent != null)
+                    {
+                        _viewContent.Content = item.Content;
+                        UpdateCoverViewContent(true);
+                    }
+
+                    return;
+                }
+
+                if (!Equals(_selectedItem, item))
+                {
+                    _selectedItem.IsSelected = false;
+                    item.IsSelected = true;
+                    _selectedItem = item;
+                    if (_viewContent != null)
+                    {
+                        _viewContent.Content = item.Content;
+                        UpdateCoverViewContent(true);
+                    }
+
+                    return;
+                }
+
+                if (_viewContent != null)
+                {
+                    _viewContent.Content = null;
+                    UpdateCoverViewContent(false);
+                }
+                _selectedItem.IsSelected = false;
+                _selectedItem = null;
+            }
+        }
+
+        public override void OnApplyTemplate()
+        {
+            base.OnApplyTemplate();
+
+            if (_viewContent.Style == null)
+            {
+                _viewContent.Style = CoverViewContentStyle;
+            }
+
+            if (_selectedItem != null)
+            {
+                UpdateCoverViewContent(_selectedItem != null);
+            }
+        }
+
+        protected override DependencyObject GetContainerForItemOverride() => new CoverViewItem();
+
+        protected override bool IsItemItsOwnContainerOverride(object item) => item is CoverViewItem;
+
+        public static readonly DependencyProperty CoverViewContentStyleProperty = DependencyProperty.Register(
+            "CoverViewContentStyle", typeof(Style), typeof(CoverView), new PropertyMetadata(default(Style)));
+
+        public Style CoverViewContentStyle
+        {
+            get => (Style)GetValue(CoverViewContentStyleProperty);
+            set => SetValue(CoverViewContentStyleProperty, value);
+        }
+
+        internal static readonly DependencyProperty GroupsProperty = DependencyProperty.Register(
+            "Groups", typeof(int), typeof(CoverView),
+            new FrameworkPropertyMetadata(ValueBoxes.Int5Box, FrameworkPropertyMetadataOptions.AffectsMeasure,
+                OnGroupsChanged), IsGroupsValid);
+
+        internal static void OnGroupsChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            if (d is CoverView ctl)
+            {
+                ctl.UpdateCoverViewContent(ctl._viewContent.IsOpen);
+            }
+        }
+
+        private static bool IsGroupsValid(object value)
+        {
+            var v = (int)value;
+            return v >= 1;
+        }
+
+        public int Groups
+        {
+            get => (int)GetValue(GroupsProperty);
+            set => SetValue(GroupsProperty, value);
+        }
+
+        public static readonly DependencyProperty ItemContentHeightProperty = DependencyProperty.Register(
+            "ItemContentHeight", typeof(double), typeof(CoverView), new PropertyMetadata(ValueBoxes.Double300Box),
+            value => ValidateHelper.IsInRangeOfPosDouble(value, true));
+
+        public double ItemContentHeight
+        {
+            get => (double)GetValue(ItemContentHeightProperty);
+            set => SetValue(ItemContentHeightProperty, value);
+        }
+
+        public static readonly DependencyProperty ItemContentHeightFixedProperty = DependencyProperty.Register(
+            "ItemContentHeightFixed", typeof(bool), typeof(CoverView), new PropertyMetadata(ValueBoxes.TrueBox));
+
+        public bool ItemContentHeightFixed
+        {
+            get => (bool)GetValue(ItemContentHeightFixedProperty);
+            set => SetValue(ItemContentHeightFixedProperty, value);
+        }
+
+        protected override void OnRenderSizeChanged(SizeChangedInfo sizeInfo)
+        {
+            base.OnRenderSizeChanged(sizeInfo);
+
+            Groups = (int)(sizeInfo.NewSize.Width / (ItemWidth + ItemMargin.Left + ItemMargin.Right));
+        }
+
+        protected override void Refresh()
+        {
+            if (ItemsHost == null) return;
+
+            ItemsHost.Children.Clear();
+            var index = 0;
+            foreach (var item in Items)
+            {
+                DependencyObject container;
+                if (IsItemItsOwnContainerOverride(item))
+                {
+                    container = item as DependencyObject;
+                }
+                else
+                {
+                    container = GetContainerForItemOverride();
+                    PrepareContainerForItemOverride(container, item);
+                }
+
+                if (container is CoverViewItem element)
+                {
+                    element.Index = index++;
+                    element.Style = ItemContainerStyle;
+                    ItemsHost.Children.Add(element);
+                }
+            }
+        }
+
+        /// <summary>
+        ///     更新内容视图
+        /// </summary>
+        private void UpdateCoverViewContent(bool isOpen)
+        {
+            if (_selectedItem == null) return;
+
+            ItemsHost.Children.Remove(_viewContent);
+
+            if (!ItemContentHeightFixed)
+            {
+                _viewContent.ManualHeight = 0;
+                if (_viewContent.Content is FrameworkElement element)
+                {
+                    element.Arrange(new Rect(new Size(double.MaxValue, double.MaxValue)));
+                    _viewContent.ManualHeight = element.ActualHeight;
+                }
+            }
+
+            var total = Items.Count + 1;
+            var totalRow = total / Groups + (total % Groups > 0 ? 1 : 0);
+            if (total <= Groups)
+            {
+                ItemsHost.Children.Add(_viewContent);
+            }
+            else
+            {
+                var row = _selectedItem.Index / Groups + 1;
+                if (row == totalRow)
+                {
+                    ItemsHost.Children.Add(_viewContent);
+                }
+                else
+                {
+                    ItemsHost.Children.Insert(row * Groups, _viewContent);
+                }
+            }
+
+            _viewContent.UpdatePosition(_selectedItem.Index, Groups, _selectedItem.DesiredSize.Width);
+            if (_viewContent.CanSwitch)
+            {
+                _viewContent.IsOpen = isOpen;
+            }
+        }
+    }
+}

Net40/HandyControl_Net40/Controls/Cover/CoverView/CoverViewContent.cs

@@ -0,0 +1,122 @@
+using System.Windows;
+using System.Windows.Controls;
+using HandyControl.Data;
+using HandyControl.Expression.Drawing;
+using HandyControl.Tools;
+using HandyControl.Tools.Extension;
+
+namespace HandyControl.Controls
+{
+    [TemplatePart(Name = ElementTriangle, Type = typeof(FrameworkElement))]
+    [TemplatePart(Name = ElementContent, Type = typeof(FrameworkElement))]
+    internal class CoverViewContent : ContentControl
+    {
+        private const string ElementTriangle = "PART_Triangle";
+
+        private const string ElementContent = "PART_Content";
+
+        private FrameworkElement _triangle;
+
+        private FrameworkElement _content;
+
+        internal bool WaitForUpdate { get; set; }
+
+        private int _index;
+
+        private int _groups;
+
+        private double _itemWidth;
+
+        internal bool CanSwitch { get; set; } = true;
+
+        private bool _isOpen;
+
+        internal bool IsOpen
+        {
+            get => _isOpen;
+            set
+            {
+                if (_isOpen == value) return;
+                _isOpen = value;
+                OpenSwitch(value);
+            }
+        }
+
+        internal static readonly DependencyProperty ManualHeightProperty = DependencyProperty.Register(
+            "ManualHeight", typeof(double), typeof(CoverViewContent), new PropertyMetadata(default(double)), value => ValidateHelper.IsInRangeOfPosDouble(value, true));
+
+        internal double ManualHeight
+        {
+            get => (double)GetValue(ManualHeightProperty);
+            set => SetValue(ManualHeightProperty, value);
+        }
+
+        public static readonly DependencyProperty ContentHeightProperty = DependencyProperty.Register(
+            "ContentHeight", typeof(double), typeof(CoverViewContent), new PropertyMetadata(ValueBoxes.Double300Box),
+            value => ValidateHelper.IsInRangeOfPosDouble(value, true));
+
+        public double ContentHeight
+        {
+            get => (double)GetValue(ContentHeightProperty);
+            set => SetValue(ContentHeightProperty, value);
+        }
+
+        public override void OnApplyTemplate()
+        {
+            base.OnApplyTemplate();
+
+            _triangle = GetTemplateChild(ElementTriangle) as FrameworkElement;
+            _content = GetTemplateChild(ElementContent) as FrameworkElement;
+
+            if (WaitForUpdate)
+            {
+                _triangle.BeginAnimation(MarginProperty, AnimationHelper.CreateAnimation(new Thickness((_index % _groups + .5) * _itemWidth - _triangle.Width / 2, 0, 0, 0)));
+                OpenSwitch(_isOpen);
+                WaitForUpdate = false;
+            }
+        }
+
+        internal void UpdatePosition(int index, int groups, double itemWidth)
+        {
+            if (_triangle == null)
+            {
+                _index = index;
+                _groups = groups;
+                _itemWidth = itemWidth;
+                WaitForUpdate = true;
+                return;
+            }
+            _triangle.BeginAnimation(MarginProperty, AnimationHelper.CreateAnimation(new Thickness((index % groups + .5) * itemWidth - _triangle.Width / 2, 0, 0, 0)));
+            if (IsOpen)
+            {
+                if (ManualHeight > 0 && !MathHelper.AreClose(ManualHeight, ContentHeight))
+                {
+                    _content.BeginAnimation(HeightProperty, AnimationHelper.CreateAnimation(ManualHeight));
+                }
+                else
+                {
+                    _content.BeginAnimation(HeightProperty, AnimationHelper.CreateAnimation(ContentHeight));
+                }
+            }
+        }
+
+        private void OpenSwitch(bool isOpen)
+        {
+            if (_content == null) return;
+            var animation = AnimationHelper.CreateAnimation(isOpen ? ManualHeight > 0 ? ManualHeight : ContentHeight : 0);
+            _triangle.Show(false);
+            this.Show(true);
+            animation.Completed += (s, e) =>
+            {
+                CanSwitch = true;
+                this.Show(IsOpen);
+                if (IsOpen)
+                {
+                    _triangle.Show(true);
+                }
+            };
+            CanSwitch = false;
+            _content.BeginAnimation(HeightProperty, animation);
+        }
+    }
+}

Net40/HandyControl_Net40/Controls/Cover/CoverView/CoverViewItem.cs

@@ -0,0 +1,7 @@
+namespace HandyControl.Controls
+{
+    public class CoverViewItem : HeaderedSelectableItem
+    {       
+        internal int Index { get; set; }
+    }
+}

Net40/HandyControl_Net40/Controls/Input/SearchBar.cs

@@ -39,6 +39,7 @@ namespace HandyControl.Controls
             if (_textBox != null)
             {
                 _textBox.TextChanged -= TextBox_TextChanged;
+                _textBox.KeyDown -= TextBox_KeyDown;
             }
 
             base.OnApplyTemplate();

Net40/HandyControl_Net40/Controls/Other/ChatBubble.cs

@@ -0,0 +1,52 @@
+using System;
+using System.Windows;
+using HandyControl.Data;
+
+namespace HandyControl.Controls
+{
+    public class ChatBubble : SelectableItem
+    {
+        public static readonly DependencyProperty RoleProperty = DependencyProperty.Register(
+            "Role", typeof(ChatRoleType), typeof(ChatBubble), new PropertyMetadata(default(ChatRoleType)));
+
+        public ChatRoleType Role
+        {
+            get => (ChatRoleType)GetValue(RoleProperty);
+            set => SetValue(RoleProperty, value);
+        }
+
+        public static readonly DependencyProperty TypeProperty = DependencyProperty.Register(
+            "Type", typeof(ChatMessageType), typeof(ChatBubble), new PropertyMetadata(default(ChatMessageType)));
+
+        public ChatMessageType Type
+        {
+            get => (ChatMessageType)GetValue(TypeProperty);
+            set => SetValue(TypeProperty, value);
+        }
+
+        public static readonly DependencyProperty IsReadProperty = DependencyProperty.Register(
+            "IsRead", typeof(bool), typeof(ChatBubble), new PropertyMetadata(ValueBoxes.FalseBox));
+
+        public bool IsRead
+        {
+            get => (bool)GetValue(IsReadProperty);
+            set => SetValue(IsReadProperty, value);
+        }
+
+        public static void SetMaxWidth(DependencyObject element, double value)
+            => element.SetValue(MaxWidthProperty, value);
+
+        public static double GetMaxWidth(DependencyObject element)
+            => (double)element.GetValue(MaxWidthProperty);
+
+        public Action<object> ReadAction { get; set; }
+
+        protected override void OnSelected(RoutedEventArgs e)
+        {
+            base.OnSelected(e);
+
+            IsRead = true;
+            ReadAction?.Invoke(Content);
+        }
+    }
+}

Net40/HandyControl_Net40/Controls/Transfer/Transfer.cs

@@ -0,0 +1,223 @@
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Collections.Specialized;
+using System.Linq;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+using HandyControl.Interactivity;
+using HandyControl.Tools.Extension;
+
+namespace HandyControl.Controls
+{
+    /// <summary>
+    ///     穿梭框
+    /// </summary>
+    [TemplatePart(Name = ElementItemsOrigin, Type = typeof(SimpleItemsControl))]
+    [TemplatePart(Name = ElementItemsSelected, Type = typeof(SimpleItemsControl))]
+    public class Transfer : SimpleItemsControl
+    {
+        private const string ElementItemsOrigin = "PART_ItemsOrigin";
+
+        private const string ElementItemsSelected = "PART_ItemsSelected";
+
+        private readonly Dictionary<object, TransferEntry> _entryDic = new Dictionary<object, TransferEntry>();
+
+        private SimpleItemsControl _itemsOrigin;
+
+        private SimpleItemsControl _itemsSelected;
+
+        private IEnumerable _itemsSourceInternal;
+
+        public static readonly RoutedEvent SelectionChangedEvent =
+            EventManager.RegisterRoutedEvent("SelectionChanged", RoutingStrategy.Bubble,
+                typeof(SelectionChangedEventHandler), typeof(Transfer));
+
+        public event SelectionChangedEventHandler SelectionChanged
+        {
+            add => AddHandler(SelectionChangedEvent, value);
+            remove => RemoveHandler(SelectionChangedEvent, value);
+        }
+
+        private static readonly DependencyPropertyKey SelectedItemsPropertyKey =
+            DependencyProperty.RegisterReadOnly(
+                "SelectedItems",
+                typeof(IList),
+                typeof(Transfer),
+                new FrameworkPropertyMetadata(default(IList)));
+
+        public static readonly DependencyProperty SelectedItemsProperty = SelectedItemsPropertyKey.DependencyProperty;
+
+        public IList SelectedItems
+        {
+            get => (IList)GetValue(SelectedItemsProperty);
+            set => SetValue(SelectedItemsProperty, value);
+        }
+
+        public Transfer()
+        {
+            CommandBindings.Add(new CommandBinding(ControlCommands.Selected, SelectItems));
+            CommandBindings.Add(new CommandBinding(ControlCommands.Cancel, DeselectItems));
+
+            SetValue(SelectedItemsPropertyKey, new ObservableCollection<object>());
+        }
+
+        public override void OnApplyTemplate()
+        {
+            _itemsOrigin?.ItemsHost.Children.Clear();
+            _itemsSelected?.ItemsHost.Children.Clear();
+
+            _itemsOrigin = GetTemplateChild(ElementItemsOrigin) as SimpleItemsControl;
+            _itemsSelected = GetTemplateChild(ElementItemsSelected) as SimpleItemsControl;
+
+            Refresh();
+        }
+
+        private void AddItem(object item)
+        {
+            var origin = new TransferItem
+            {
+                Content = item
+            };
+            var selected = new TransferItem
+            {
+                Content = item,
+                IsOrigin = false
+            };
+            var entry = new TransferEntry
+            {
+                OriginItem = origin,
+                SelectedItem = selected
+            };
+            _entryDic.Add(item, entry);
+            _itemsOrigin.Items.Add(origin);
+            _itemsSelected.Items.Add(selected);
+        }
+
+        private void RemoveItem(object item)
+        {
+            if (_entryDic.TryGetValue(item, out var entry))
+            {
+                _itemsOrigin.Items.Remove(entry.OriginItem);
+                _itemsSelected.Items.Remove(entry.SelectedItem);
+                _entryDic.Remove(item);
+            }
+        }
+
+        private void ClearItems()
+        {
+            _entryDic.Clear();
+            _itemsOrigin.Items.Clear();
+            _itemsSelected.Items.Clear();
+        }
+
+        protected override void OnItemsSourceChanged(IEnumerable oldValue, IEnumerable newValue)
+        {
+            if (_itemsSourceInternal != null)
+            {
+                if (_itemsSourceInternal is INotifyCollectionChanged s)
+                {
+                    s.CollectionChanged -= InternalCollectionChanged;
+                }
+
+                ClearItems();
+            }
+            _itemsSourceInternal = newValue;
+            if (_itemsSourceInternal != null)
+            {
+                if (_itemsSourceInternal is INotifyCollectionChanged s)
+                {
+                    s.CollectionChanged += InternalCollectionChanged;
+                }
+                foreach (var item in _itemsSourceInternal)
+                {
+                    AddItem(item);
+                }
+            }
+        }
+
+        private void InternalCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            if (e.OldItems != null)
+            {
+                foreach (var item in e.OldItems)
+                {
+                    RemoveItem(item);
+                }
+            }
+            if (e.NewItems != null)
+            {
+                foreach (var item in e.NewItems)
+                {
+                    AddItem(item);
+                }
+            }
+        }
+
+        protected override DependencyObject GetContainerForItemOverride() => new TransferItem();
+
+        protected override bool IsItemItsOwnContainerOverride(object item) => item is TransferItem;
+
+        private void SelectItems(object sender, ExecutedRoutedEventArgs e)
+        {
+            var list = _entryDic.Where(item => item.Value.OriginItem.IsSelected).ToList();
+            list.Do(item => item.Value.StatusSwitch(true)).Do(item => SelectedItems.Add(item.Key));
+            RaiseEvent(new SelectionChangedEventArgs(SelectionChangedEvent, new List<object>(), list));
+        }
+
+        private void DeselectItems(object sender, ExecutedRoutedEventArgs e)
+        {
+            var list = _entryDic.Where(item => item.Value.SelectedItem.IsSelected).ToList();
+            list.Do(item => item.Value.StatusSwitch(false)).Do(item => SelectedItems.Remove(item.Key));
+            RaiseEvent(new SelectionChangedEventArgs(SelectionChangedEvent, list, new List<object>()));
+        }
+
+        protected override void OnItemsChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+
+        }
+
+        protected override void OnItemTemplateChanged(DependencyPropertyChangedEventArgs e)
+        {
+
+        }
+
+        protected override void OnItemContainerStyleChanged(DependencyPropertyChangedEventArgs e)
+        {
+
+        }
+
+        protected override void Refresh()
+        {
+            if (_entryDic.Count > 0)
+            {
+                _entryDic.Select(item => item.Value.OriginItem).Do(item => _itemsOrigin.Items.Add(item));
+                _entryDic.Select(item => item.Value.SelectedItem).Do(item => _itemsSelected.Items.Add(item));
+            }
+        }
+
+        private struct TransferEntry
+        {
+            public TransferItem OriginItem { get; set; }
+
+            public TransferItem SelectedItem { get; set; }
+
+            public void StatusSwitch(bool isTransferred)
+            {
+                if (isTransferred)
+                {
+                    OriginItem.IsTransferred = true;
+                    SelectedItem.IsTransferred = true;
+                    OriginItem.IsSelected = false;
+                }
+                else
+                {
+                    OriginItem.IsTransferred = false;
+                    SelectedItem.IsTransferred = false;
+                    SelectedItem.IsSelected = false;
+                }
+            }
+        }
+    }
+}

Net40/HandyControl_Net40/Controls/Transfer/TransferGroup.cs

@@ -0,0 +1,54 @@
+using System.Collections.Specialized;
+using System.Windows;
+
+namespace HandyControl.Controls
+{
+    public class TransferGroup : SimpleItemsControl
+    {
+        protected override void Refresh()
+        {
+            if (Items.Count > 0)
+            {
+                foreach (FrameworkElement item in Items)
+                {
+                    item.Style = ItemContainerStyle;
+                    ItemsHost.Children.Add(item);
+                }
+            }
+        }
+
+        protected override void OnItemTemplateChanged(DependencyPropertyChangedEventArgs e)
+        {
+
+        }
+
+        protected override void OnItemContainerStyleChanged(DependencyPropertyChangedEventArgs e)
+        {
+
+        }
+
+        protected override DependencyObject GetContainerForItemOverride() => new TransferItem();
+
+        protected override bool IsItemItsOwnContainerOverride(object item) => item is TransferItem;
+
+        protected override void OnItemsChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            if (ItemsHost == null) return;
+            if (e.OldItems != null)
+            {
+                foreach (FrameworkElement item in e.OldItems)
+                {
+                    ItemsHost.Children.Remove(item);
+                }
+            }
+            if (e.NewItems != null)
+            {
+                foreach (FrameworkElement item in e.NewItems)
+                {
+                    item.Style = ItemContainerStyle;
+                    ItemsHost.Children.Add(item);
+                }
+            }
+        }
+    }
+}

Net40/HandyControl_Net40/Controls/Transfer/TransferItem.cs

@@ -0,0 +1,26 @@
+using System.Windows;
+using HandyControl.Data;
+
+namespace HandyControl.Controls
+{
+    public class TransferItem : SelectableItem
+    {
+        public static readonly DependencyProperty IsTransferredProperty = DependencyProperty.Register(
+            "IsTransferred", typeof(bool), typeof(TransferItem), new PropertyMetadata(ValueBoxes.FalseBox));
+
+        public bool IsTransferred
+        {
+            get => (bool)GetValue(IsTransferredProperty);
+            set => SetValue(IsTransferredProperty, value);
+        }
+
+        public static readonly DependencyProperty IsOriginProperty = DependencyProperty.Register(
+            "IsOrigin", typeof(bool), typeof(TransferItem), new PropertyMetadata(ValueBoxes.TrueBox));
+
+        public bool IsOrigin
+        {
+            get => (bool)GetValue(IsOriginProperty);
+            internal set => SetValue(IsOriginProperty, value);
+        }
+    }
+}

Net40/HandyControl_Net40/Controls/Window/MessageBox.cs

@@ -1,6 +1,5 @@
 using System;
 using System.ComponentModel;
-using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
@@ -28,7 +27,7 @@ namespace HandyControl.Controls
 
         private MessageBoxResult _messageBoxResult = MessageBoxResult.Cancel;
 
-        private bool _showOK;
+        private bool _showOk;
 
         private bool _showCancel;
 
@@ -50,7 +49,7 @@ namespace HandyControl.Controls
             {
                 _messageBoxResult = MessageBoxResult.OK;
                 Close();
-            }, (s, e) => e.CanExecute = _showOK));
+            }, (s, e) => e.CanExecute = _showOk));
             CommandBindings.Add(new CommandBinding(ControlCommands.Cancel, (s, e) =>
             {
                 _messageBoxResult = MessageBoxResult.Cancel;
@@ -92,12 +91,16 @@ namespace HandyControl.Controls
         /// <param name="caption"></param>
         public static MessageBoxResult Success(string messageBoxText, string caption = null)
         {
-            var messageBox = CreateMessageBox(null, messageBoxText, caption, MessageBoxButton.OK, MessageBoxImage.None, MessageBoxResult.OK);
-            SetButtonStatus(messageBox, MessageBoxButton.OK);
-            messageBox._showImage = true;
-            messageBox._image = ResourceHelper.GetResource<Geometry>(ResourceToken.SuccessGeometry);
-            messageBox._imageBrush = ResourceHelper.GetResource<Brush>(ResourceToken.SuccessBrush);
-            messageBox.ShowDialog();
+            MessageBox messageBox = null;
+            Application.Current.Dispatcher.Invoke(new Action(() =>
+            {
+                messageBox = CreateMessageBox(null, messageBoxText, caption, MessageBoxButton.OK, MessageBoxImage.None, MessageBoxResult.OK);
+                SetButtonStatus(messageBox, MessageBoxButton.OK);
+                messageBox._showImage = true;
+                messageBox._image = ResourceHelper.GetResource<Geometry>(ResourceToken.SuccessGeometry);
+                messageBox._imageBrush = ResourceHelper.GetResource<Brush>(ResourceToken.SuccessBrush);
+                messageBox.ShowDialog();
+            }));
 
             return messageBox._messageBoxResult;
         }
@@ -109,10 +112,14 @@ namespace HandyControl.Controls
         /// <param name="caption"></param>
         public static MessageBoxResult Info(string messageBoxText, string caption = null)
         {
-            var messageBox = CreateMessageBox(null, messageBoxText, caption, MessageBoxButton.OK, MessageBoxImage.Information, MessageBoxResult.OK);
-            SetButtonStatus(messageBox, MessageBoxButton.OK);
-            SetImage(messageBox, MessageBoxImage.Information);
-            messageBox.ShowDialog();
+            MessageBox messageBox = null;
+            Application.Current.Dispatcher.Invoke(new Action(() =>
+            {
+                messageBox = CreateMessageBox(null, messageBoxText, caption, MessageBoxButton.OK, MessageBoxImage.Information, MessageBoxResult.OK);
+                SetButtonStatus(messageBox, MessageBoxButton.OK);
+                SetImage(messageBox, MessageBoxImage.Information);
+                messageBox.ShowDialog();
+            }));
 
             return messageBox._messageBoxResult;
         }
@@ -124,10 +131,14 @@ namespace HandyControl.Controls
         /// <param name="caption"></param>
         public static MessageBoxResult Warning(string messageBoxText, string caption = null)
         {
-            var messageBox = CreateMessageBox(null, messageBoxText, caption, MessageBoxButton.OK, MessageBoxImage.Warning, MessageBoxResult.OK);
-            SetButtonStatus(messageBox, MessageBoxButton.OK);
-            SetImage(messageBox, MessageBoxImage.Warning);
-            messageBox.ShowDialog();
+            MessageBox messageBox = null;
+            Application.Current.Dispatcher.Invoke(new Action(() =>
+            {
+                messageBox = CreateMessageBox(null, messageBoxText, caption, MessageBoxButton.OK, MessageBoxImage.Warning, MessageBoxResult.OK);
+                SetButtonStatus(messageBox, MessageBoxButton.OK);
+                SetImage(messageBox, MessageBoxImage.Warning);
+                messageBox.ShowDialog();
+            }));
 
             return messageBox._messageBoxResult;
         }
@@ -139,10 +150,14 @@ namespace HandyControl.Controls
         /// <param name="caption"></param>
         public static MessageBoxResult Error(string messageBoxText, string caption = null)
         {
-            var messageBox = CreateMessageBox(null, messageBoxText, caption, MessageBoxButton.OK, MessageBoxImage.Error, MessageBoxResult.OK);
-            SetButtonStatus(messageBox, MessageBoxButton.OK);
-            SetImage(messageBox, MessageBoxImage.Error);
-            messageBox.ShowDialog();
+            MessageBox messageBox = null;
+            Application.Current.Dispatcher.Invoke(new Action(() =>
+            {
+                messageBox = CreateMessageBox(null, messageBoxText, caption, MessageBoxButton.OK, MessageBoxImage.Error, MessageBoxResult.OK);
+                SetButtonStatus(messageBox, MessageBoxButton.OK);
+                SetImage(messageBox, MessageBoxImage.Error);
+                messageBox.ShowDialog();
+            }));
 
             return messageBox._messageBoxResult;
         }
@@ -154,12 +169,16 @@ namespace HandyControl.Controls
         /// <param name="caption"></param>
         public static MessageBoxResult Fatal(string messageBoxText, string caption = null)
         {
-            var messageBox = CreateMessageBox(null, messageBoxText, caption, MessageBoxButton.OK, MessageBoxImage.None, MessageBoxResult.OK);
-            SetButtonStatus(messageBox, MessageBoxButton.OK);
-            messageBox._showImage = true;
-            messageBox._image = ResourceHelper.GetResource<Geometry>(ResourceToken.FatalGeometry);
-            messageBox._imageBrush = ResourceHelper.GetResource<Brush>(ResourceToken.PrimaryTextBrush);
-            messageBox.ShowDialog();
+            MessageBox messageBox = null;
+            Application.Current.Dispatcher.Invoke(new Action(() =>
+            {
+                messageBox = CreateMessageBox(null, messageBoxText, caption, MessageBoxButton.OK, MessageBoxImage.None, MessageBoxResult.OK);
+                SetButtonStatus(messageBox, MessageBoxButton.OK);
+                messageBox._showImage = true;
+                messageBox._image = ResourceHelper.GetResource<Geometry>(ResourceToken.FatalGeometry);
+                messageBox._imageBrush = ResourceHelper.GetResource<Brush>(ResourceToken.PrimaryTextBrush);
+                messageBox.ShowDialog();
+            }));
 
             return messageBox._messageBoxResult;
         }
@@ -171,36 +190,79 @@ namespace HandyControl.Controls
         /// <param name="caption"></param>
         public static MessageBoxResult Ask(string messageBoxText, string caption = null)
         {
-            var messageBox = CreateMessageBox(null, messageBoxText, caption, MessageBoxButton.OKCancel, MessageBoxImage.Question, MessageBoxResult.Cancel);
-            SetButtonStatus(messageBox, MessageBoxButton.OKCancel);
-            SetImage(messageBox, MessageBoxImage.Question);
-            messageBox.ShowDialog();
+            MessageBox messageBox = null;
+            Application.Current.Dispatcher.Invoke(new Action(() =>
+            {
+                messageBox = CreateMessageBox(null, messageBoxText, caption, MessageBoxButton.OKCancel, MessageBoxImage.Question, MessageBoxResult.Cancel);
+                SetButtonStatus(messageBox, MessageBoxButton.OKCancel);
+                SetImage(messageBox, MessageBoxImage.Question);
+                messageBox.ShowDialog();
+            }));
 
             return messageBox._messageBoxResult;
         }
 
-        public static MessageBoxResult CustomShow(string messageBoxText, string caption = null, MessageBoxButton button = MessageBoxButton.OK, string iconKey = "", string iconBrushKey = "", MessageBoxResult defaultResult = MessageBoxResult.None)
+        /// <summary>
+        ///     自定义信息展示
+        /// </summary>
+        /// <param name="info"></param>
+        /// <returns></returns>
+        public static MessageBoxResult Show(MessageBoxInfo info)
         {
-            var messageBox = CreateMessageBox(null, messageBoxText, caption, button, MessageBoxImage.None, defaultResult);
-            messageBox._showImage = true;
-            messageBox._image = ResourceHelper.GetResource<Geometry>(iconKey);
-            messageBox._imageBrush = ResourceHelper.GetResource<Brush>(iconBrushKey);
-            messageBox.ShowDialog();
+            MessageBox messageBox = null;
+            Application.Current.Dispatcher.Invoke(new Action(() =>
+            {
+                messageBox = CreateMessageBox(null, info.MessageBoxText, info.Caption, info.Button, MessageBoxImage.None, info.DefaultResult);
+                SetButtonStatus(messageBox, info.Button);
+
+                if (!string.IsNullOrEmpty(info.IconKey))
+                {
+                    messageBox._showImage = true;
+                    messageBox._image = ResourceHelper.GetResource<Geometry>(info.IconKey);
+                    messageBox._imageBrush = ResourceHelper.GetResource<Brush>(info.IconBrushKey);
+                }
+
+                messageBox.Style = info.Style;
+                messageBox.ShowDialog();
+            }));
 
             return messageBox._messageBoxResult;
         }
 
-        public static MessageBoxResult Show(string messageBoxText, string caption = null, MessageBoxButton button = MessageBoxButton.OK, MessageBoxImage icon = MessageBoxImage.None, MessageBoxResult defaultResult = MessageBoxResult.None)
-        {
-            return Show(null, messageBoxText, caption, button, icon, defaultResult);
-        }
+        /// <summary>
+        ///     信息展示
+        /// </summary>
+        /// <param name="messageBoxText"></param>
+        /// <param name="caption"></param>
+        /// <param name="button"></param>
+        /// <param name="icon"></param>
+        /// <param name="defaultResult"></param>
+        /// <returns></returns>
+        public static MessageBoxResult Show(string messageBoxText, string caption = null,
+            MessageBoxButton button = MessageBoxButton.OK, MessageBoxImage icon = MessageBoxImage.None,
+            MessageBoxResult defaultResult = MessageBoxResult.None) =>
+            Show(null, messageBoxText, caption, button, icon, defaultResult);
 
+        /// <summary>
+        ///     信息展示
+        /// </summary>
+        /// <param name="owner"></param>
+        /// <param name="messageBoxText"></param>
+        /// <param name="caption"></param>
+        /// <param name="button"></param>
+        /// <param name="icon"></param>
+        /// <param name="defaultResult"></param>
+        /// <returns></returns>
         public static MessageBoxResult Show(System.Windows.Window owner, string messageBoxText, string caption = null, MessageBoxButton button = MessageBoxButton.OK, MessageBoxImage icon = MessageBoxImage.None, MessageBoxResult defaultResult = MessageBoxResult.None)
         {
-            var messageBox = CreateMessageBox(owner, messageBoxText, caption, button, icon, defaultResult);
-            SetButtonStatus(messageBox, button);
-            SetImage(messageBox, icon);
-            messageBox.ShowDialog();
+            MessageBox messageBox = null;
+            Application.Current.Dispatcher.Invoke(new Action(() =>
+            {
+                messageBox = CreateMessageBox(owner, messageBoxText, caption, button, icon, defaultResult);
+                SetButtonStatus(messageBox, button);
+                SetImage(messageBox, icon);
+                messageBox.ShowDialog();
+            }));
 
             return messageBox._messageBoxResult;
         }
@@ -226,7 +288,7 @@ namespace HandyControl.Controls
                 throw new InvalidEnumArgumentException(nameof(defaultResult), (int)defaultResult, typeof(MessageBoxResult));
             }
 
-            var ownerWindow = owner ?? Application.Current.Windows.OfType<Window>().SingleOrDefault(x => x.IsActive);
+            var ownerWindow = owner ?? VisualHelper.GetActiveWindow();
             var ownerIsNull = ownerWindow is null;
 
             return new MessageBox
@@ -246,10 +308,10 @@ namespace HandyControl.Controls
             switch (messageBoxButton)
             {
                 case MessageBoxButton.OK:
-                    messageBox._showOK = true;
+                    messageBox._showOk = true;
                     break;
                 case MessageBoxButton.OKCancel:
-                    messageBox._showOK = true;
+                    messageBox._showOk = true;
                     messageBox._showCancel = true;
                     break;
                 case MessageBoxButton.YesNo:

Net40/HandyControl_Net40/Data/Enum/ChatMessageType.cs

@@ -0,0 +1,10 @@
+namespace HandyControl.Data
+{
+    public enum ChatMessageType
+    {
+        String,
+        Image,
+        Audio,
+        Custom
+    }
+}

Net40/HandyControl_Net40/Data/Enum/ChatRoleType.cs

@@ -0,0 +1,8 @@
+namespace HandyControl.Data
+{
+    public enum ChatRoleType
+    {
+        Sender,
+        Receiver
+    }
+}

Net40/HandyControl_Net40/Data/MessageBoxInfo.cs

@@ -0,0 +1,21 @@
+using System.Windows;
+
+namespace HandyControl.Data
+{
+    public class MessageBoxInfo
+    {
+        public string MessageBoxText { get; set; }
+
+        public string Caption { get; set; }
+
+        public MessageBoxButton Button { get; set; } = MessageBoxButton.OK;
+
+        public string IconKey { get; set; }
+
+        public string IconBrushKey { get; set; }
+
+        public MessageBoxResult DefaultResult { get; set; } = MessageBoxResult.None;
+
+        public Style Style { get; set; }
+    }
+}

Net40/HandyControl_Net40/Data/ResourceToken.cs

@@ -1,68 +1,68 @@
 namespace HandyControl.Data
 {
-	internal class ResourceToken
+    public class ResourceToken
     {
-        public static readonly string SuccessGeometry = nameof(SuccessGeometry);
+        public const string SuccessGeometry = nameof(SuccessGeometry);
 
-        public static readonly string InfoGeometry = nameof(InfoGeometry);
+        public const string InfoGeometry = nameof(InfoGeometry);
 
-        public static readonly string ErrorGeometry = nameof(ErrorGeometry);
+        public const string ErrorGeometry = nameof(ErrorGeometry);
 
-        public static readonly string WarningGeometry = nameof(WarningGeometry);
+        public const string WarningGeometry = nameof(WarningGeometry);
 
-        public static readonly string AskGeometry = nameof(AskGeometry);
+        public const string AskGeometry = nameof(AskGeometry);
 
-        public static readonly string FatalGeometry = nameof(FatalGeometry);
+        public const string FatalGeometry = nameof(FatalGeometry);
 
-        public static readonly string PrimaryBrush = nameof(PrimaryBrush);
+        public const string PrimaryBrush = nameof(PrimaryBrush);
 
-        public static readonly string SuccessBrush = nameof(SuccessBrush);
+        public const string SuccessBrush = nameof(SuccessBrush);
 
-        public static readonly string InfoBrush = nameof(InfoBrush);
+        public const string InfoBrush = nameof(InfoBrush);
 
-        public static readonly string DangerBrush = nameof(DangerBrush);
+        public const string DangerBrush = nameof(DangerBrush);
 
-        public static readonly string WarningBrush = nameof(WarningBrush);
+        public const string WarningBrush = nameof(WarningBrush);
 
-        public static readonly string AccentBrush = nameof(AccentBrush);
+        public const string AccentBrush = nameof(AccentBrush);
 
-        public static readonly string PrimaryTextBrush = nameof(PrimaryTextBrush);
+        public const string PrimaryTextBrush = nameof(PrimaryTextBrush);
 
-        public static readonly string ThirdlyTextBrush = nameof(ThirdlyTextBrush);
+        public const string ThirdlyTextBrush = nameof(ThirdlyTextBrush);
 
-        public static readonly string BlurGradientValue = nameof(BlurGradientValue);
+        internal const string BlurGradientValue = nameof(BlurGradientValue);
 
-        public static readonly string ButtonCustom = nameof(ButtonCustom);
+        internal const string ButtonCustom = nameof(ButtonCustom);
 
-        public static readonly string PaginationButtonStyle = nameof(PaginationButtonStyle);
+        internal const string PaginationButtonStyle = nameof(PaginationButtonStyle);
 
-        public static readonly string WindowWin10 = nameof(WindowWin10);
+        internal const string WindowWin10 = nameof(WindowWin10);
 
-        public static readonly string AddTagButtonStyle = nameof(AddTagButtonStyle);
+        internal const string AddTagButtonStyle = nameof(AddTagButtonStyle);
 
-        public static readonly string RadioGroupItemDefault = nameof(RadioGroupItemDefault);
+        internal const string RadioGroupItemDefault = nameof(RadioGroupItemDefault);
 
-        public static readonly string RadioGroupItemSingle = nameof(RadioGroupItemSingle);
+        internal const string RadioGroupItemSingle = nameof(RadioGroupItemSingle);
 
-        public static readonly string RadioGroupItemHorizontalFirst = nameof(RadioGroupItemHorizontalFirst);
+        internal const string RadioGroupItemHorizontalFirst = nameof(RadioGroupItemHorizontalFirst);
 
-        public static readonly string RadioGroupItemHorizontalLast = nameof(RadioGroupItemHorizontalLast);
+        internal const string RadioGroupItemHorizontalLast = nameof(RadioGroupItemHorizontalLast);
 
-        public static readonly string RadioGroupItemVerticalFirst = nameof(RadioGroupItemVerticalFirst);
+        internal const string RadioGroupItemVerticalFirst = nameof(RadioGroupItemVerticalFirst);
 
-        public static readonly string RadioGroupItemVerticalLast = nameof(RadioGroupItemVerticalLast);
+        internal const string RadioGroupItemVerticalLast = nameof(RadioGroupItemVerticalLast);
 
-        public static readonly string TabItemCapsuleDefault = nameof(TabItemCapsuleDefault);
+        internal const string TabItemCapsuleDefault = nameof(TabItemCapsuleDefault);
 
-        public static readonly string TabItemCapsuleSingle = nameof(TabItemCapsuleSingle);
+        internal const string TabItemCapsuleSingle = nameof(TabItemCapsuleSingle);
 
-        public static readonly string TabItemCapsuleHorizontalFirst = nameof(TabItemCapsuleHorizontalFirst);
+        internal const string TabItemCapsuleHorizontalFirst = nameof(TabItemCapsuleHorizontalFirst);
 
-        public static readonly string TabItemCapsuleHorizontalLast = nameof(TabItemCapsuleHorizontalLast);
+        internal const string TabItemCapsuleHorizontalLast = nameof(TabItemCapsuleHorizontalLast);
 
-        public static readonly string TabItemCapsuleVerticalFirst = nameof(TabItemCapsuleVerticalFirst);
+        internal const string TabItemCapsuleVerticalFirst = nameof(TabItemCapsuleVerticalFirst);
 
-        public static readonly string TabItemCapsuleVerticalLast = nameof(TabItemCapsuleVerticalLast);
+        internal const string TabItemCapsuleVerticalLast = nameof(TabItemCapsuleVerticalLast);
 
     }
 }

Net40/HandyControl_Net40/Data/ResourceToken.tt

@@ -1,63 +0,0 @@
-<#@ template debug="false" hostspecific="false" language="C#" #>
-<#@ import namespace="System.Collections.Generic"#>
-<#@ output extension=".cs" #>
-<#
-var geometryList = new List<string>
-{
-	"SuccessGeometry",
-	"InfoGeometry",
-	"ErrorGeometry",
-	"WarningGeometry",
-	"AskGeometry",
-	"FatalGeometry",
-	"PrimaryBrush"
-};
-var brushList = new List<string>
-{
-	"SuccessBrush",
-	"InfoBrush",
-	"DangerBrush",
-	"WarningBrush",
-	"AccentBrush",
-	"PrimaryTextBrush",
-	"ThirdlyTextBrush",
-	"BlurGradientValue"
-};
-var styleList = new List<string>
-{
-	"ButtonCustom",
-	"PaginationButtonStyle",
-	"WindowWin10",
-	"AddTagButtonStyle",
-	"RadioGroupItemDefault",
-	"RadioGroupItemSingle",
-	"RadioGroupItemHorizontalFirst",
-	"RadioGroupItemHorizontalLast",
-	"RadioGroupItemVerticalFirst",
-	"RadioGroupItemVerticalLast",
-	"TabItemCapsuleDefault",
-	"TabItemCapsuleSingle",
-	"TabItemCapsuleHorizontalFirst",
-	"TabItemCapsuleHorizontalLast",
-	"TabItemCapsuleVerticalFirst",
-	"TabItemCapsuleVerticalLast"
-};
-#>
-namespace HandyControl.Data
-{
-	internal class ResourceToken
-    {
-    <#foreach(var item in geometryList){#>
-    public static readonly string <#=item#> = nameof(<#=item#>);
-
-    <#}#>
-<#foreach(var item in brushList){#>
-    public static readonly string <#=item#> = nameof(<#=item#>);
-
-    <#}#>
-<#foreach(var item in styleList){#>
-    public static readonly string <#=item#> = nameof(<#=item#>);
-
-    <#}#>
-}
-}

Net40/HandyControl_Net40/HandyControl_Net40.csproj

@@ -44,10 +44,11 @@
     <Compile Include="Controls\Base\RegularItemsControl.cs" />
     <Compile Include="Controls\Base\SelectableItem.cs" />
     <Compile Include="Controls\Base\SimpleItemsControl.cs" />
-    <Compile Include="Controls\CoverFlow\CoverFlow.cs" />
-    <Compile Include="Controls\CoverFlow\CoverFlowItem.cs" />
-    <Compile Include="Controls\CoverView\CoverViewContent.cs" />
-    <Compile Include="Controls\CoverView\CoverViewItem.cs" />
+    <Compile Include="Controls\Button\ProgressButton.cs" />
+    <Compile Include="Controls\Cover\CoverFlow\CoverFlow.cs" />
+    <Compile Include="Controls\Cover\CoverFlow\CoverFlowItem.cs" />
+    <Compile Include="Controls\Cover\CoverView\CoverViewContent.cs" />
+    <Compile Include="Controls\Cover\CoverView\CoverViewItem.cs" />
     <Compile Include="Controls\Other\AnimationPath.cs" />
     <Compile Include="Controls\Attach\BackgroundSwitchElement.cs" />
     <Compile Include="Controls\Attach\BorderElement.cs" />
@@ -62,7 +63,8 @@
     <Compile Include="Controls\Button\ContextMenuButton.cs" />
     <Compile Include="Controls\Button\ContextMenuToggleButton.cs" />
     <Compile Include="Controls\Other\Carousel.cs" />
-    <Compile Include="Controls\CoverView\CoverView.cs" />
+    <Compile Include="Controls\Cover\CoverView\CoverView.cs" />
+    <Compile Include="Controls\Other\ChatBubble.cs" />
     <Compile Include="Controls\Panel\CirclePanel.cs" />
     <Compile Include="Controls\Other\CircleProgressBar.cs" />
     <Compile Include="Controls\Other\RadioGroup.cs" />
@@ -103,9 +105,14 @@
     <Compile Include="Controls\StepBar\StepBarItem.cs" />
     <Compile Include="Controls\Time\FlipClock\FlipClock.cs" />
     <Compile Include="Controls\Time\FlipClock\FlipNumber.cs" />
+    <Compile Include="Controls\Transfer\Transfer.cs" />
+    <Compile Include="Controls\Transfer\TransferGroup.cs" />
+    <Compile Include="Controls\Transfer\TransferItem.cs" />
     <Compile Include="Controls\Window\BlurWindow.cs" />
     <Compile Include="Controls\Window\MessageBox.cs" />
     <Compile Include="Data\Args\CancelRoutedEventArgs.cs" />
+    <Compile Include="Data\Enum\ChatMessageType.cs" />
+    <Compile Include="Data\Enum\ChatRoleType.cs" />
     <Compile Include="Data\Enum\InfoType.cs" />
     <Compile Include="Data\Enum\ResultType.cs" />
     <Compile Include="Data\Enum\SkinType.cs" />
@@ -116,19 +123,17 @@
     <Compile Include="Data\Gif\GifPropertyItem.cs" />
     <Compile Include="Data\Gif\GifPropertyItemInternal.cs" />
     <Compile Include="Data\Gif\GPStream.cs" />
+    <Compile Include="Data\MessageBoxInfo.cs" />
+    <Compile Include="Data\ResourceToken.cs" />
     <Compile Include="Data\SystemVersionInfo.cs" />
     <Compile Include="Tools\Converter\Boolean2StrConverter.cs" />
     <Compile Include="Tools\Converter\Int2StrConverter.cs" />
+    <Compile Include="Tools\Extension\EnumerableExtension.cs" />
     <Compile Include="Tools\Helper\ColorHelper.cs" />
     <Compile Include="Tools\GifImageAnimator.cs" />
     <Compile Include="Data\GrowlInfo.cs" />
     <Compile Include="Data\Operation\OperationResult!1.cs" />
     <Compile Include="Data\Operation\OperationResult.cs" />
-    <Compile Include="Data\ResourceToken.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>ResourceToken.tt</DependentUpon>
-    </Compile>
     <Compile Include="Expression\Drawing\BezierCurveFlattener.cs" />
     <Compile Include="Expression\Drawing\CommonExtensions.cs" />
     <Compile Include="Expression\Drawing\ExceptionStringTable.cs" />
@@ -304,6 +309,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Themes\Styles\Base\ChatBubbleBaseStyle.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Themes\Styles\Base\CheckBoxBaseStyle.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -324,6 +333,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Themes\Styles\Base\ProgressButtonBaseStyle.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Themes\Styles\Base\RadioGroupBaseStyle.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -344,10 +357,18 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Themes\Styles\Base\TransferBaseStyle.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Themes\Styles\Base\TreeViewBaseStyle.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Themes\Styles\ChatBubble.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Themes\Styles\CoverFlow.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -564,6 +585,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Themes\Styles\ProgressButton.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Themes\Styles\RadioButton.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -644,6 +669,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Themes\Styles\Transfer.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Themes\Styles\TransitioningContentControl.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -695,12 +724,6 @@
       <SubType>Designer</SubType>
     </EmbeddedResource>
   </ItemGroup>
-  <ItemGroup>
-    <Content Include="Data\ResourceToken.tt">
-      <Generator>TextTemplatingFileGenerator</Generator>
-      <LastGenOutput>ResourceToken.cs</LastGenOutput>
-    </Content>
-  </ItemGroup>
   <ItemGroup>
     <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
   </ItemGroup>

Net40/HandyControl_Net40/Themes/Basic/Geometries.xaml

@@ -23,6 +23,8 @@
     <Geometry x:Key="WindowMinGeometry">M0,4 L10,4 L10,5 L0,5 z</Geometry>
     <Geometry x:Key="WindowRestoreGeometry">M1,3 L1,9 L7,9 L7,3 z M3,1 L3,2 L8,2 L8,7 L9,7 L9,1 z M2,0 L10,0 L10,8 L8,8 L8,10 L0,10 L0,2 L2,2 z</Geometry>
     <Geometry x:Key="WindowMaxGeometry">M1,1 L1,9 L9,9 L9,1 z M0,0 L10,0 L10,10 L0,10 z</Geometry>
+    <Geometry x:Key="AudioGeometry">M627.52666696 962L550.66666696 890.47999971c116.82-92.99999971 191.09999971-230.94 191.09999971-385.2 0-146.99999971-67.61999971-279-174.96-371.57999942L643.84666667 62C770.86666638 172.99999971 850.66666667 330.2 850.66666667 505.09999971c0 182.27999971-86.58 345.42-223.13999971 456.90000029zM405.64666638 782l-76.32-77.22a227.88 227.88 0 0 0 116.40000058-199.26A228.06 228.06 0 0 0 347.86666638 317.84000029L422.86666696 242A334.37999971 334.37999971 0 0 1 550.66666696 505.52 334.62 334.62 0 0 1 405.64666638 782zM205.66666638 596.6C164.26666638 596.6 130.66666667 562.51999971 130.66666667 520.64 130.66666667 478.76000029 164.26666638 444.79999971 205.66666638 444.79999971s74.99999971 33.95999971 75.00000058 75.90000058c0 41.87999971-33.59999971 75.84000029-75.00000058 75.83999942z</Geometry>
+    <Geometry x:Key="BubbleTailGeometry">M0,0L28,0 28,14.0000006258488 28,15.0010000765324 28.0151405334473,15.0010000765324 28.0455417633057,15.8010965883732C28.4084091186524,22.9596563875675,30.92209815979,29.5507589876652,34.9532623291016,34.9410597383976L34.9984359741211,34.9999815523624 34.0966339111328,34.9885679781437C15.1841707229614,34.5094191133976,2.0535663480814E-07,19.0279375612736,0,0z</Geometry>
     <Geometry x:Key="StarGeometry">M535.9 165.2l96.5 195.4c3.9 7.9 11.4 13.3 20.1 14.6l215.7 31.3c21.9 3.2 30.6 30 14.8 45.5L726.8 604.1c-6.3 6.1-9.1 14.9-7.7 23.6L756 842.5c3.7 21.8-19.1 38.4-38.7 28.1L524.4 769.2c-7.8-4.1-17-4.1-24.8 0L306.7 870.6c-19.6 10.3-42.4-6.3-38.7-28.1l36.8-214.8c1.5-8.6-1.4-17.5-7.7-23.6L141.1 452c-15.8-15.4-7.1-42.3 14.8-45.5l215.7-31.3c8.7-1.3 16.2-6.7 20.1-14.6l96.5-195.4c9.7-19.9 37.9-19.9 47.7 0z</Geometry>
     <Geometry x:Key="AddGeometry">M938.666667 426.666667h-341.333334V85.333333c0-46.933333-38.4-85.333333-85.333333-85.333333s-85.333333 38.4-85.333333 85.333333v341.333334H85.333333c-46.933333 0-85.333333 38.4-85.333333 85.333333s38.4 85.333333 85.333333 85.333333h341.333334v341.333334c0 46.933333 38.4 85.333333 85.333333 85.333333s85.333333-38.4 85.333333-85.333333v-341.333334h341.333334c46.933333 0 85.333333-38.4 85.333333-85.333333s-38.4-85.333333-85.333333-85.333333z</Geometry>
     <Geometry x:Key="SubGeometry">M62.5797 488.9508c0.2632 42.5185 34.985 77.2116 77.5035 77.5035l743.0216-0.6728c42.5185 0.3215 76.7437-33.9333 76.4518-76.4805l0 0c-0.2918-42.5175-34.985-77.2106-77.5045-77.5035l-743.0216-0.087C96.513 411.4473 62.2879 446.4323 62.5797 488.9508L62.5797 488.9508z</Geometry>

Net40/HandyControl_Net40/Themes/Styles/Base/ChatBubbleBaseStyle.xaml

@@ -0,0 +1,165 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="clr-namespace:HandyControl.Controls">
+
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="../../Basic/Converters.xaml"/>
+        <ResourceDictionary Source="../../Basic/Geometries.xaml"/>
+        <ResourceDictionary Source="../../Basic/Sizes.xaml"/>
+    </ResourceDictionary.MergedDictionaries>
+
+    <ControlTemplate x:Key="ChatBubbleStringBaseTemplate" TargetType="controls:ChatBubble">
+        <Grid>
+            <Path Name="Tail"  Data="{StaticResource BubbleTailGeometry}" Fill="{TemplateBinding Background}" HorizontalAlignment="Right" Stretch="Uniform" VerticalAlignment="Bottom" Width="15" Height="15" RenderTransformOrigin="0.5,0.5"/>
+            <Border Name="Body" Background="{TemplateBinding Background}" CornerRadius="15" Margin="0,0,3,0">
+                <TextBlock TextWrapping="Wrap" Text="{TemplateBinding Content}" VerticalAlignment="Center" Margin="{TemplateBinding Padding}"/>
+            </Border>
+        </Grid>
+        <ControlTemplate.Triggers>
+            <Trigger Property="Role" Value="Receiver">
+                <Setter TargetName="Tail" Property="HorizontalAlignment" Value="Left"/>
+                <Setter TargetName="Tail" Property="RenderTransform">
+                    <Setter.Value>
+                        <TransformGroup>
+                            <ScaleTransform ScaleY="1" ScaleX="-1"/>
+                        </TransformGroup>
+                    </Setter.Value>
+                </Setter>
+                <Setter TargetName="Body" Property="Margin" Value="3,0,0,0"/>
+            </Trigger>
+        </ControlTemplate.Triggers>
+    </ControlTemplate>
+
+    <ControlTemplate x:Key="ChatBubbleImageBaseTemplate" TargetType="controls:ChatBubble">
+        <Grid>
+            <Path Name="Tail"  Data="{StaticResource BubbleTailGeometry}" Fill="{TemplateBinding Background}" HorizontalAlignment="Right" Stretch="Uniform" VerticalAlignment="Bottom" Width="15" Height="15" RenderTransformOrigin="0.5,0.5"/>
+            <Border Name="Body" Background="{TemplateBinding Background}" CornerRadius="15" Margin="0,0,3,0">
+                <Grid>
+                    <Image Margin="{TemplateBinding Padding}" VerticalAlignment="Center" Source="{TemplateBinding Content}"/>
+                    <Border BorderThickness="{TemplateBinding Padding}" BorderBrush="{TemplateBinding Background}" Background="{x:Null}" CornerRadius="15"/>
+                </Grid>
+            </Border>
+        </Grid>
+        <ControlTemplate.Triggers>
+            <Trigger Property="Role" Value="Receiver">
+                <Setter TargetName="Tail" Property="HorizontalAlignment" Value="Left"/>
+                <Setter TargetName="Tail" Property="RenderTransform">
+                    <Setter.Value>
+                        <TransformGroup>
+                            <ScaleTransform ScaleY="1" ScaleX="-1"/>
+                        </TransformGroup>
+                    </Setter.Value>
+                </Setter>
+                <Setter TargetName="Body" Property="Margin" Value="3,0,0,0"/>
+            </Trigger>
+        </ControlTemplate.Triggers>
+    </ControlTemplate>
+
+    <ControlTemplate x:Key="ChatBubbleAudioBaseTemplate" TargetType="controls:ChatBubble">
+        <Grid>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="12" Name="Definition1"/>
+                <ColumnDefinition Name="Definition2"/>
+            </Grid.ColumnDefinitions>
+            <Ellipse Name="Dot" VerticalAlignment="Top" Fill="{DynamicResource DangerBrush}" Width="6" Height="6" Visibility="{TemplateBinding IsRead,Converter={StaticResource Boolean2BooleanReConverter}}" Margin="0,0,6,0"/>
+            <Path Name="Tail" Grid.Column="1" Data="{StaticResource BubbleTailGeometry}" Fill="{TemplateBinding Background}" HorizontalAlignment="Right" Stretch="Uniform" VerticalAlignment="Bottom" Width="15" Height="15" RenderTransformOrigin="0.5,0.5"/>
+            <Border Name="Body" Grid.Column="1" Background="{TemplateBinding Background}" CornerRadius="15" Margin="0,0,3,0">
+                <Grid VerticalAlignment="Center" Margin="{TemplateBinding Padding}">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="Auto"/>
+                    </Grid.ColumnDefinitions>
+                    <ContentPresenter Name="Presenter" VerticalAlignment="Center"/>
+                    <Path Name="Audio" Grid.Column="1" Data="{StaticResource AudioGeometry}" Fill="{TemplateBinding Foreground}" Width="16" Height="16" Margin="6,0,0,0" RenderTransformOrigin="0.5,0.5">
+                        <Path.RenderTransform>
+                            <TransformGroup>
+                                <ScaleTransform ScaleY="1" ScaleX="-1"/>
+                            </TransformGroup>
+                        </Path.RenderTransform>
+                    </Path>
+                </Grid>
+            </Border>
+        </Grid>
+        <ControlTemplate.Triggers>
+            <Trigger Property="Role" Value="Receiver">
+                <Setter TargetName="Tail" Property="HorizontalAlignment" Value="Left"/>
+                <Setter TargetName="Tail" Property="RenderTransform">
+                    <Setter.Value>
+                        <TransformGroup>
+                            <ScaleTransform ScaleY="1" ScaleX="-1"/>
+                        </TransformGroup>
+                    </Setter.Value>
+                </Setter>
+                <Setter TargetName="Tail" Property="Grid.Column" Value="0"/>
+                <Setter TargetName="Dot" Property="Grid.Column" Value="1"/>
+                <Setter TargetName="Dot" Property="Margin" Value="6,0,0,0"/>
+                <Setter TargetName="Body" Property="Margin" Value="3,0,0,0"/>
+                <Setter TargetName="Body" Property="Grid.Column" Value="0"/>
+                <Setter TargetName="Definition1" Property="Width" Value="Auto"/>
+                <Setter TargetName="Definition2" Property="Width" Value="12"/>
+                <Setter TargetName="Audio" Property="Grid.Column" Value="0"/>
+                <Setter TargetName="Audio" Property="Margin" Value="0,0,6,0"/>
+                <Setter TargetName="Audio" Property="RenderTransform">
+                    <Setter.Value>
+                        <TransformGroup>
+                            <ScaleTransform ScaleY="1" ScaleX="1"/>
+                        </TransformGroup>
+                    </Setter.Value>
+                </Setter>
+                <Setter TargetName="Presenter" Property="Grid.Column" Value="1"/>
+            </Trigger>
+        </ControlTemplate.Triggers>
+    </ControlTemplate>
+
+    <ControlTemplate x:Key="ChatBubbleCustomBaseTemplate" TargetType="controls:ChatBubble">
+        <Grid>
+            <Path Name="Tail"  Data="{StaticResource BubbleTailGeometry}" Fill="{TemplateBinding Background}" HorizontalAlignment="Right" Stretch="Uniform" VerticalAlignment="Bottom" Width="15" Height="15" RenderTransformOrigin="0.5,0.5"/>
+            <Border Name="Body" Background="{TemplateBinding Background}" CornerRadius="15" Margin="0,0,3,0">
+                <ContentPresenter VerticalAlignment="Center" Margin="{TemplateBinding Padding}"/>
+            </Border>
+        </Grid>
+        <ControlTemplate.Triggers>
+            <Trigger Property="Role" Value="Receiver">
+                <Setter TargetName="Tail" Property="HorizontalAlignment" Value="Left"/>
+                <Setter TargetName="Tail" Property="RenderTransform">
+                    <Setter.Value>
+                        <TransformGroup>
+                            <ScaleTransform ScaleY="1" ScaleX="-1"/>
+                        </TransformGroup>
+                    </Setter.Value>
+                </Setter>
+                <Setter TargetName="Body" Property="Margin" Value="3,0,0,0"/>
+            </Trigger>
+        </ControlTemplate.Triggers>
+    </ControlTemplate>
+
+    <Style x:Key="ChatBubbleBaseStyle" TargetType="controls:ChatBubble">
+        <Setter Property="HorizontalAlignment" Value="Right"/>
+        <Setter Property="Background" Value="{DynamicResource DarkPrimaryBrush}"/>
+        <Setter Property="Foreground" Value="{DynamicResource TextIconBrush}"/>
+        <Setter Property="Padding" Value="10"/>
+        <Setter Property="Margin" Value="10"/>
+        <Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}"/>
+        <Setter Property="Template" Value="{StaticResource ChatBubbleStringBaseTemplate}"/>
+        <Setter Property="IsRead" Value="{Binding IsSelected,RelativeSource={RelativeSource Self}}"/>
+        <Setter Property="MaxWidth" Value="280"/>
+        <Style.Triggers>
+            <Trigger Property="Role" Value="Receiver">
+                <Setter Property="Background" Value="{DynamicResource BorderBrush}"/>
+                <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
+                <Setter Property="HorizontalAlignment" Value="Left"/>
+            </Trigger>
+            <Trigger Property="Type" Value="Image">
+                <Setter Property="Template" Value="{StaticResource ChatBubbleImageBaseTemplate}"/>
+                <Setter Property="MaxHeight" Value="280"/>
+            </Trigger>
+            <Trigger Property="Type" Value="Audio">
+                <Setter Property="Template" Value="{StaticResource ChatBubbleAudioBaseTemplate}"/>
+            </Trigger>
+            <Trigger Property="Type" Value="Custom">
+                <Setter Property="Template" Value="{StaticResource ChatBubbleCustomBaseTemplate}"/>
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+</ResourceDictionary>

Net40/HandyControl_Net40/Themes/Styles/Base/ProgressBarBaseStyle.xaml

@@ -76,7 +76,7 @@
         <Setter Property="Height" Value="100"/>
         <Setter Property="Width" Value="100"/>
         <Setter Property="ArcThickness" Value="4"/>
-        <Setter Property="Text" Value="{Binding Value,RelativeSource={RelativeSource Self},StringFormat={}{0} %}"></Setter>
+        <Setter Property="Text" Value="{Binding Value,RelativeSource={RelativeSource Self},StringFormat={}{0} %}"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="controls:CircleProgressBar">

Net40/HandyControl_Net40/Themes/Styles/Base/ProgressButtonBaseStyle.xaml

@@ -0,0 +1,67 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="clr-namespace:HandyControl.Controls"
+                    xmlns:system="clr-namespace:System;assembly=mscorlib">
+
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="ToggleButtonBaseStyle.xaml"/>
+        <ResourceDictionary Source="ProgressBarBaseStyle.xaml"/>
+    </ResourceDictionary.MergedDictionaries>
+
+    <Style x:Key="ProgressBarFlat4ProgressButton" TargetType="ProgressBar">
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="controls:BorderElement.CornerRadius" Value="4"/>
+        <Setter Property="Foreground" Value="{DynamicResource DarkMaskBrush}"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ProgressBar">
+                    <Border x:Name="PART_Track">
+                        <Decorator x:Name="PART_Indicator" HorizontalAlignment="Left">
+                            <Border CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="Indicator" Background="{TemplateBinding Foreground}"/>
+                        </Decorator>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="ProgressButtonBaseStyle" BasedOn="{StaticResource ToggleButtonBaseStyle}" TargetType="controls:ProgressButton">
+        <Setter Property="ProgressStyle" Value="{StaticResource ProgressBarFlat4ProgressButton}"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="controls:ProgressButton">
+                    <Border x:Name="Chrome" CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}">
+                        <Grid>
+                            <ProgressBar x:Name="ProgressBar" Height="{x:Static system:Double.NaN}" Value="{TemplateBinding Progress}" Maximum="100" Visibility="Collapsed" Style="{TemplateBinding ProgressStyle}"/>
+                            <ContentPresenter Name="UnCheckedElement"  Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                            <ContentPresenter Name="CheckedElement" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" Visibility="Collapsed" Content="{Binding Path=(controls:StatusSwitchElement.CheckedElement),RelativeSource={RelativeSource TemplatedParent}}"/>
+                        </Grid>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter Property="Opacity" Value=".9"/>
+                        </Trigger>
+                        <Trigger Property="IsPressed" Value="True">
+                            <Setter Property="Opacity" Value=".6"/>
+                        </Trigger>
+                        <Trigger Property="IsChecked" Value="True">
+                            <Setter Property="Visibility" Value="Visible" TargetName="ProgressBar"/>
+                            <Setter Property="Visibility" Value="Visible" TargetName="CheckedElement"/>
+                        </Trigger>
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="controls:StatusSwitchElement.HiddenElement" Value="True"/>
+                                <Condition Property="IsChecked" Value="True"/>
+                            </MultiTrigger.Conditions>
+                            <Setter Property="Visibility" Value="Collapsed" TargetName="UnCheckedElement"/>
+                        </MultiTrigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Opacity" Value="0.4"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+</ResourceDictionary> 

Net40/HandyControl_Net40/Themes/Styles/Base/TransferBaseStyle.xaml

@@ -0,0 +1,115 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="clr-namespace:HandyControl.Controls"
+                    xmlns:interactivity="clr-namespace:HandyControl.Interactivity">
+
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="../../Basic/Geometries.xaml"/>
+        <ResourceDictionary Source="../../Basic/Behaviors.xaml"/>
+        <ResourceDictionary Source="../../Basic/Sizes.xaml"/>
+    </ResourceDictionary.MergedDictionaries>
+
+    <Style x:Key="TransferItemBaseStyle" TargetType="controls:TransferItem">
+        <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
+        <Setter Property="CanDeselect" Value="True"/>
+        <Setter Property="SelfManage" Value="True"/>
+        <Setter Property="Padding" Value="10, 0"/>
+        <Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}"/>
+        <Setter Property="Margin" Value="5,0,5,5"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="controls:TransferItem">
+                    <Border x:Name="BorderRoot" Background="{DynamicResource RegionBrush}" CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}">
+                        <ContentPresenter x:Name="ContentPresenter" VerticalAlignment="Center" Margin="{TemplateBinding Padding}" ContentTemplate="{Binding ItemTemplate,RelativeSource={RelativeSource AncestorType=controls:TransferGroup}}"/>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsSelected" Value="True">
+                            <Setter TargetName="BorderRoot" Property="Background" Value="{DynamicResource PrimaryBrush}"/>
+                            <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource TextIconBrush}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Style.Triggers>
+            <MultiTrigger>
+                <MultiTrigger.Conditions>
+                    <Condition Property="IsOrigin" Value="True"/>
+                    <Condition Property="IsTransferred" Value="False"/>
+                </MultiTrigger.Conditions>
+                <Setter Property="Visibility" Value="Visible"/>
+            </MultiTrigger>
+            <MultiTrigger>
+                <MultiTrigger.Conditions>
+                    <Condition Property="IsOrigin" Value="True"/>
+                    <Condition Property="IsTransferred" Value="True"/>
+                </MultiTrigger.Conditions>
+                <Setter Property="Visibility" Value="Collapsed"/>
+            </MultiTrigger>
+            <MultiTrigger>
+                <MultiTrigger.Conditions>
+                    <Condition Property="IsOrigin" Value="False"/>
+                    <Condition Property="IsTransferred" Value="True"/>
+                </MultiTrigger.Conditions>
+                <Setter Property="Visibility" Value="Visible"/>
+            </MultiTrigger>
+            <MultiTrigger>
+                <MultiTrigger.Conditions>
+                    <Condition Property="IsOrigin" Value="False"/>
+                    <Condition Property="IsTransferred" Value="False"/>
+                </MultiTrigger.Conditions>
+                <Setter Property="Visibility" Value="Collapsed"/>
+            </MultiTrigger>
+        </Style.Triggers>
+    </Style>
+
+    <Style x:Key="TransferGroupBaseStyle" TargetType="controls:TransferGroup">
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="Background" Value="{DynamicResource DarkDefaultBrush}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="controls:TransferGroup">
+                    <Border Background="{TemplateBinding Background}" CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
+                        <ScrollViewer Margin="0,5">
+                            <StackPanel x:Name="PART_Panel"/>
+                        </ScrollViewer>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="TransferBaseStyle" TargetType="controls:Transfer">
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="controls:BorderElement.CornerRadius" Value="4"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
+        <Setter Property="ItemContainerStyle" Value="{StaticResource TransferItemBaseStyle}"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="controls:Transfer">
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition MinWidth="200"/>
+                            <ColumnDefinition Width="Auto"/>
+                            <ColumnDefinition MinWidth="200"/>
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                            <RowDefinition/>
+                            <RowDefinition/>
+                            <RowDefinition/>
+                            <RowDefinition/>
+                        </Grid.RowDefinitions>
+                        <controls:TransferGroup x:Name="PART_ItemsOrigin" Style="{StaticResource TransferGroupBaseStyle}" Grid.RowSpan="4" ItemTemplate="{TemplateBinding ItemTemplate}" ItemContainerStyle="{TemplateBinding ItemContainerStyle}"/>
+                        <StackPanel Margin="32,0" VerticalAlignment="Center" HorizontalAlignment="Center" Grid.Row="0" Grid.RowSpan="4" Grid.Column="1">
+                            <Button controls:IconElement.Geometry="{StaticResource LeftGeometry}" Command="interactivity:ControlCommands.Cancel"/>
+                            <Button controls:IconElement.Geometry="{StaticResource RightGeometry}" Margin="0,10,0,0" Command="interactivity:ControlCommands.Selected"/>
+                        </StackPanel>
+                        <controls:TransferGroup x:Name="PART_ItemsSelected" Style="{StaticResource TransferGroupBaseStyle}" Grid.Row="0" Grid.RowSpan="4" Grid.Column="2" ItemTemplate="{TemplateBinding ItemTemplate}" ItemContainerStyle="{TemplateBinding ItemContainerStyle}"/>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+</ResourceDictionary>

Net40/HandyControl_Net40/Themes/Styles/Carousel.xaml

@@ -9,7 +9,22 @@
         <ResourceDictionary Source="ListBox.xaml"/>
     </ResourceDictionary.MergedDictionaries>
 
-    <Style TargetType="controls:Carousel" BasedOn="{StaticResource StackPanelListBox}">
+    <Style x:Key="CarouselListBoxItemStyle" BasedOn="{StaticResource ListBoxItemCustom}" TargetType="ListBoxItem">
+        <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
+        <Setter Property="VerticalContentAlignment" Value="Stretch"/>
+        <Setter Property="Height" Value="{Binding ActualHeight, RelativeSource={RelativeSource AncestorType=ItemsControl}}"/>
+    </Style>
+
+    <ItemsPanelTemplate x:Key="CarouselListBoxItemPanelTemplate">
+        <StackPanel FocusVisualStyle="{x:Null}" Orientation="Horizontal" HorizontalAlignment="Left"/>
+    </ItemsPanelTemplate>
+
+    <Style x:Key="CarouselListBox" BasedOn="{StaticResource ListBoxBaseStyle}" TargetType="ListBox">
+        <Setter Property="ItemsPanel" Value="{StaticResource CarouselListBoxItemPanelTemplate}"/>
+        <Setter Property="ItemContainerStyle" Value="{StaticResource CarouselListBoxItemStyle}"/>
+    </Style>
+
+    <Style TargetType="controls:Carousel" BasedOn="{StaticResource CarouselListBox}">
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="controls:Carousel">

Net40/HandyControl_Net40/Themes/Styles/ChatBubble.xaml

@@ -0,0 +1,10 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:controls="clr-namespace:HandyControl.Controls">
+
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="Base/ChatBubbleBaseStyle.xaml"/>
+    </ResourceDictionary.MergedDictionaries>
+
+    <Style BasedOn="{StaticResource ChatBubbleBaseStyle}" TargetType="controls:ChatBubble"/>
+
+</ResourceDictionary> 

Net40/HandyControl_Net40/Themes/Styles/ListBox.xaml

@@ -8,7 +8,7 @@
     <!--默认样式-->
     <Style BasedOn="{StaticResource ListBoxBaseStyle}" TargetType="ListBox"/>
 
-    <Style x:Key="ListBoxItemStyle" TargetType="ListBoxItem">
+    <Style x:Key="ListBoxItemCustom" TargetType="ListBoxItem">
         <Setter Property="SnapsToDevicePixels" Value="True"/>
         <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
         <Setter Property="Padding" Value="0"/>
@@ -26,28 +26,41 @@
         </Setter>
     </Style>
 
-    <Style x:Key="ListBoxItemFullStyle" BasedOn="{StaticResource ListBoxItemStyle}" TargetType="ListBoxItem">
+    <Style x:Key="ListBoxCustom" TargetType="ListBox">
+        <Setter Property="ItemContainerStyle" Value="{StaticResource ListBoxItemCustom}"/>
         <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
-        <Setter Property="VerticalContentAlignment" Value="Stretch"/>
-        <Setter Property="Height" Value="{Binding ActualHeight, RelativeSource={RelativeSource AncestorType=ItemsControl}}"/>
     </Style>
 
-    <ItemsPanelTemplate x:Key="WrapPanelItemsPanelTemplate">
+    <ItemsPanelTemplate x:Key="WrapPanelHorizontalItemsPanelTemplate">
         <WrapPanel FocusVisualStyle="{x:Null}"/>
     </ItemsPanelTemplate>
 
-    <Style x:Key="WrapPanelListBox" BasedOn="{StaticResource ListBoxBaseStyle}" TargetType="ListBox">
-        <Setter Property="ItemsPanel" Value="{StaticResource WrapPanelItemsPanelTemplate}"/>
-        <Setter Property="ItemContainerStyle" Value="{StaticResource ListBoxItemStyle}"/>
+    <Style x:Key="WrapPanelHorizontalListBox" BasedOn="{StaticResource ListBoxCustom}" TargetType="ListBox">
+        <Setter Property="ItemsPanel" Value="{StaticResource WrapPanelHorizontalItemsPanelTemplate}"/>
     </Style>
 
-    <ItemsPanelTemplate x:Key="StackPanelItemsPanelTemplate">
-        <StackPanel FocusVisualStyle="{x:Null}" Orientation="Horizontal" HorizontalAlignment="Left"/>
+    <ItemsPanelTemplate x:Key="WrapPanelVerticalItemsPanelTemplate">
+        <WrapPanel FocusVisualStyle="{x:Null}" Orientation="Vertical"/>
     </ItemsPanelTemplate>
 
-    <Style x:Key="StackPanelListBox" BasedOn="{StaticResource ListBoxBaseStyle}" TargetType="ListBox">
-        <Setter Property="ItemsPanel" Value="{StaticResource StackPanelItemsPanelTemplate}"/>
-        <Setter Property="ItemContainerStyle" Value="{StaticResource ListBoxItemFullStyle}"/>
+    <Style x:Key="WrapPanelVerticalListBox" BasedOn="{StaticResource ListBoxCustom}" TargetType="ListBox">
+        <Setter Property="ItemsPanel" Value="{StaticResource WrapPanelVerticalItemsPanelTemplate}"/>
+    </Style>
+
+    <ItemsPanelTemplate x:Key="StackPanelHorizontalItemsPanelTemplate">
+        <StackPanel FocusVisualStyle="{x:Null}" Orientation="Horizontal"/>
+    </ItemsPanelTemplate>
+
+    <Style x:Key="StackPanelHorizontalListBox" BasedOn="{StaticResource ListBoxCustom}" TargetType="ListBox">
+        <Setter Property="ItemsPanel" Value="{StaticResource StackPanelHorizontalItemsPanelTemplate}"/>
+    </Style>
+
+    <ItemsPanelTemplate x:Key="StackPanelVerticalItemsPanelTemplate">
+        <StackPanel FocusVisualStyle="{x:Null}" HorizontalAlignment="Stretch"/>
+    </ItemsPanelTemplate>
+
+    <Style x:Key="StackPanelVerticalListBox" BasedOn="{StaticResource ListBoxCustom}" TargetType="ListBox">
+        <Setter Property="ItemsPanel" Value="{StaticResource StackPanelVerticalItemsPanelTemplate}"/>
     </Style>
 
 </ResourceDictionary>

Net40/HandyControl_Net40/Themes/Styles/ProgressButton.xaml

@@ -0,0 +1,43 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="clr-namespace:HandyControl.Controls">
+
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="Base/ProgressButtonBaseStyle.xaml"/>
+    </ResourceDictionary.MergedDictionaries>
+
+    <Style BasedOn="{StaticResource ProgressButtonBaseStyle}" TargetType="controls:ProgressButton">
+        <Setter Property="Background" Value="{DynamicResource DefaultBrush}"/>
+        <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Style.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter Property="Background" Value="{DynamicResource DarkDefaultBrush}"/>
+            </Trigger>
+            <Trigger Property="IsPressed" Value="True">
+                <Setter Property="Background" Value="{DynamicResource BorderBrush}"/>
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+    <Style x:Key="ProgressButtonPrimary" BasedOn="{StaticResource ProgressButtonBaseStyle}" TargetType="controls:ProgressButton">
+        <Setter Property="Background" Value="{DynamicResource PrimaryBrush}"/>
+    </Style>
+
+    <Style x:Key="ProgressButtonSuccess" BasedOn="{StaticResource ProgressButtonBaseStyle}" TargetType="controls:ProgressButton">
+        <Setter Property="Background" Value="{DynamicResource SuccessBrush}"/>
+    </Style>
+
+    <Style x:Key="ProgressButtonInfo" BasedOn="{StaticResource ProgressButtonBaseStyle}" TargetType="controls:ProgressButton">
+        <Setter Property="Background" Value="{DynamicResource InfoBrush}"/>
+    </Style>
+
+    <Style x:Key="ProgressButtonWarning" BasedOn="{StaticResource ProgressButtonBaseStyle}" TargetType="controls:ProgressButton">
+        <Setter Property="Background" Value="{DynamicResource WarningBrush}"/>
+    </Style>
+
+    <Style x:Key="ProgressButtonDanger" BasedOn="{StaticResource ProgressButtonBaseStyle}" TargetType="controls:ProgressButton">
+        <Setter Property="Background" Value="{DynamicResource DangerBrush}"/>
+    </Style>
+
+</ResourceDictionary>

Net40/HandyControl_Net40/Themes/Styles/Style.xaml

@@ -54,6 +54,9 @@
         <ResourceDictionary Source="Shield.xaml"/>
         <ResourceDictionary Source="CoverView.xaml"/>
         <ResourceDictionary Source="CoverFlow.xaml"/>
+        <ResourceDictionary Source="ProgressButton.xaml"/>
+        <ResourceDictionary Source="Transfer.xaml"/>
+        <ResourceDictionary Source="ChatBubble.xaml"/>
     </ResourceDictionary.MergedDictionaries>
 
 </ResourceDictionary>

Net40/HandyControl_Net40/Themes/Styles/Transfer.xaml

@@ -0,0 +1,10 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:controls="clr-namespace:HandyControl.Controls">
+
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="Base/TransferBaseStyle.xaml"/>
+    </ResourceDictionary.MergedDictionaries>
+
+    <Style BasedOn="{StaticResource TransferBaseStyle}" TargetType="controls:Transfer"/>
+
+</ResourceDictionary>

Net40/HandyControl_Net40/Themes/Styles/Window.xaml

@@ -56,14 +56,16 @@
         <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
         <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
         <Setter Property="UseLayoutRounding" Value="True"/>
-        <Setter Property="NonClientAreaBackground" Value="{DynamicResource TitleBrush}"/>
-        <Setter Property="NonClientAreaForeground" Value="White"/>
-        <Setter Property="CloseButtonHoverBackground" Value="#e71123"/>
-        <Setter Property="CloseButtonHoverForeground" Value="White"/>
+        <Setter Property="NonClientAreaBackground" Value="White"/>
+        <Setter Property="NonClientAreaForeground" Value="{DynamicResource ReverseTextBrush}"/>
         <Setter Property="CloseButtonBackground" Value="Transparent"/>
-        <Setter Property="OtherButtonHoverBackground" Value="{DynamicResource DarkPrimaryBrush}"/>
-        <Setter Property="OtherButtonHoverForeground" Value="White"/>
+        <Setter Property="CloseButtonForeground" Value="{DynamicResource ReverseTextBrush}"/>
+        <Setter Property="CloseButtonHoverBackground" Value="#e81123"/>
+        <Setter Property="CloseButtonHoverForeground" Value="White"/>
         <Setter Property="OtherButtonBackground" Value="Transparent"/>
+        <Setter Property="OtherButtonForeground" Value="{DynamicResource ReverseTextBrush}"/>
+        <Setter Property="OtherButtonHoverBackground" Value="#e5e5e5"/>
+        <Setter Property="OtherButtonHoverForeground" Value="{DynamicResource ReverseTextBrush}"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="controls:Window">

Net40/HandyControl_Net40/Tools/Extension/EnumerableExtension.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace HandyControl.Tools.Extension
+{
+    public static class EnumerableExtension
+    {
+        public static IEnumerable<TSource> Do<TSource>(this IEnumerable<TSource> source, Action<TSource> predicate)
+        {
+            var enumerable = source as IList<TSource> ?? source.ToList();
+            foreach (var item in enumerable)
+            {
+                predicate.Invoke(item);
+            }
+
+            return enumerable;
+        }
+    }
+}

Net40/HandyControl_Net40/Tools/Helper/ValidateHelper.cs

@@ -3,17 +3,41 @@
     /// <summary>
     ///     验证帮助类
     /// </summary>
-    internal class ValidateHelper
+    public class ValidateHelper
     {
         /// <summary>
         ///     是否在浮点数范围内
         /// </summary>
         /// <param name="value"></param>
         /// <returns></returns>
-        internal static bool IsInRangeOfDouble(object value)
+        public static bool IsInRangeOfDouble(object value)
         {
             var v = (double)value;
             return !(double.IsNaN(v) || double.IsInfinity(v));
         }
+
+        /// <summary>
+        ///     是否在正浮点数范围内
+        /// </summary>
+        /// <param name="value"></param>
+        /// <param name="includeZero"></param>
+        /// <returns></returns>
+        public static bool IsInRangeOfPosDouble(object value, bool includeZero = false)
+        {
+            var v = (double)value;
+            return !(double.IsNaN(v) || double.IsInfinity(v)) && (includeZero ? v >= 0 : v > 0);
+        }
+
+        /// <summary>
+        ///     是否在正浮点数范围内
+        /// </summary>
+        /// <param name="value"></param>
+        /// <param name="includeZero"></param>
+        /// <returns></returns>
+        public static bool IsInRangeOfNegDouble(object value, bool includeZero = false)
+        {
+            var v = (double)value;
+            return !(double.IsNaN(v) || double.IsInfinity(v)) && (includeZero ? v <= 0 : v < 0);
+        }
     }
 }

Net40/HandyControl_Net40/Tools/Helper/VisualHelper.cs

@@ -4,9 +4,9 @@ using System.Windows.Media;
 
 namespace HandyControl.Tools
 {
-    internal class VisualHelper
+    public class VisualHelper
     {
-        public static VisualStateGroup TryGetVisualStateGroup(DependencyObject dependencyObject, string groupName)
+        internal static VisualStateGroup TryGetVisualStateGroup(DependencyObject dependencyObject, string groupName)
         {
             var root = GetImplementationRoot(dependencyObject);
             if (root == null)
@@ -20,11 +20,13 @@ namespace HandyControl.Tools
                 .FirstOrDefault(group => string.CompareOrdinal(groupName, group.Name) == 0);
         }
 
-        public static FrameworkElement GetImplementationRoot(DependencyObject dependencyObject)
+        internal static FrameworkElement GetImplementationRoot(DependencyObject dependencyObject)
         {
             return 1 == VisualTreeHelper.GetChildrenCount(dependencyObject)
                 ? VisualTreeHelper.GetChild(dependencyObject, 0) as FrameworkElement
                 : null;
         }
+
+        public static Window GetActiveWindow() => Application.Current.Windows.OfType<Window>().SingleOrDefault(x => x.IsActive);
     }
 }