From 76d1787b45110640bde5fbaaeb268dd748465f0f Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Fri, 14 Oct 2022 00:16:35 +0800
Subject: [PATCH] refactor: improved transfer.

close #1273
---
 .../HandyControl_Net_40/Themes/Theme.xaml     | 141 ++++----
 .../HandyControlDemo_Shared/MainWindow.xaml   |  33 +-
 .../UserControl/Controls/TransferDemoCtl.xaml |  15 +-
 .../Controls/Transfer/Transfer.cs             | 310 ++++--------------
 .../Controls/Transfer/TransferGroup.cs        |  64 ----
 .../Controls/Transfer/TransferItem.cs         |  12 +-
 .../HandyControl_Shared.projitems             |   1 -
 .../Themes/Styles/Base/TransferBaseStyle.xaml | 103 ++----
 .../Themes/Styles/ListBox.xaml                |   2 +-
 .../Themes/Styles/Transfer.xaml               |  50 +++
 .../Themes/Styles/TreeView.xaml               |   2 +-
 .../HandyControl_Shared/Themes/Theme.xaml     | 126 +++----
 12 files changed, 329 insertions(+), 530 deletions(-)
 delete mode 100644 src/Shared/HandyControl_Shared/Controls/Transfer/TransferGroup.cs

diff --git a/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml b/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
index c1dfe81e..18d475d2 100644
--- a/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
+++ b/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
@@ -11774,77 +11774,36 @@
 	<Style x:Key="TransferItemBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="hc:TransferItem">
 		<Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisualMargin0}" />
 		<Setter Property="HorizontalContentAlignment" Value="Stretch" />
-		<Setter Property="CanDeselect" Value="True" />
-		<Setter Property="SelfManage" Value="True" />
-		<Setter Property="Padding" Value="10, 0" />
+		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+		<Setter Property="Padding" Value="{StaticResource DefaultControlPadding}" />
 		<Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
-		<Setter Property="Margin" Value="5,0,5,5" />
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="hc:TransferItem">
-					<Border x:Name="BorderRoot" Background="{DynamicResource RegionBrush}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}">
-						<ContentPresenter x:Name="ContentPresenter" VerticalAlignment="Center" Margin="{TemplateBinding Padding}" ContentTemplate="{Binding ItemTemplate,RelativeSource={RelativeSource AncestorType=hc:TransferGroup}}" />
+					<Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{Binding Padding,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource ThicknessSplitConverter},ConverterParameter='1,0,1,0'}" SnapsToDevicePixels="true">
+						<ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
 					</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>
+			<Trigger Property="IsMouseOver" Value="True">
+				<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+			</Trigger>
+			<Trigger Property="IsSelected" Value="True">
+				<Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
+				<Setter Property="TextElement.Foreground" Value="{DynamicResource TextIconBrush}" />
+			</Trigger>
+			<Trigger Property="IsTransferred" Value="True">
 				<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>
+			</Trigger>
 		</Style.Triggers>
 	</Style>
-	<Style x:Key="TransferGroupBaseStyle" TargetType="hc:TransferGroup">
-		<Setter Property="Focusable" Value="False" />
-		<Setter Property="BorderThickness" Value="0" />
-		<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="hc:TransferGroup">
-					<Border Background="{TemplateBinding Background}" CornerRadius="{Binding Path=(hc: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="hc:Transfer">
 		<Setter Property="Focusable" Value="False" />
 		<Setter Property="BorderThickness" Value="1" />
+		<Setter Property="Padding" Value="2" />
+		<Setter Property="SelectionMode" Value="Extended" />
 		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
 		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
 		<Setter Property="ItemContainerStyle" Value="{StaticResource TransferItemBaseStyle}" />
@@ -11853,9 +11812,9 @@
 				<ControlTemplate TargetType="hc:Transfer">
 					<Grid>
 						<Grid.ColumnDefinitions>
-							<ColumnDefinition MinWidth="200" />
+							<ColumnDefinition />
 							<ColumnDefinition Width="Auto" />
-							<ColumnDefinition MinWidth="200" />
+							<ColumnDefinition />
 						</Grid.ColumnDefinitions>
 						<Grid.RowDefinitions>
 							<RowDefinition />
@@ -11863,12 +11822,23 @@
 							<RowDefinition />
 							<RowDefinition />
 						</Grid.RowDefinitions>
-						<hc: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">
+						<Border Grid.RowSpan="4" Background="{TemplateBinding Background}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
+							<hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
+								<hc:ToggleBlock.CheckedContent>
+									<hc:ScrollViewer IsInertiaEnabled="{Binding Path=(hc:ScrollViewer.IsInertiaEnabled),RelativeSource={RelativeSource TemplatedParent}}" CanContentScroll="false" Focusable="false" HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
+										<ItemsPresenter />
+									</hc:ScrollViewer>
+								</hc:ToggleBlock.CheckedContent>
+								<hc:ToggleBlock.UnCheckedContent>
+									<hc:Empty />
+								</hc:ToggleBlock.UnCheckedContent>
+							</hc:ToggleBlock>
+						</Border>
+						<StackPanel Margin="8,0" VerticalAlignment="Center" HorizontalAlignment="Center" Grid.Row="0" Grid.RowSpan="4" Grid.Column="1">
 							<Button hc:IconElement.Geometry="{StaticResource LeftGeometry}" Command="interactivity:ControlCommands.Cancel" />
-							<Button hc:IconElement.Geometry="{StaticResource RightGeometry}" Margin="0,10,0,0" Command="interactivity:ControlCommands.Selected" />
+							<Button hc:IconElement.Geometry="{StaticResource RightGeometry}" Margin="0,8,0,0" Command="interactivity:ControlCommands.Selected" />
 						</StackPanel>
-						<hc:TransferGroup x:Name="PART_ItemsSelected" Style="{StaticResource TransferGroupBaseStyle}" Grid.Row="0" Grid.RowSpan="4" Grid.Column="2" ItemTemplate="{TemplateBinding ItemTemplate}" ItemContainerStyle="{TemplateBinding ItemContainerStyle}" />
+						<ListBox x:Name="PART_SelectedListBox" Padding="{TemplateBinding Padding}" SelectionMode="{TemplateBinding SelectionMode}" ItemContainerStyle="{TemplateBinding ItemContainerStyle}" ItemsPanel="{TemplateBinding ItemsPanel}" Grid.Row="0" Grid.RowSpan="4" Grid.Column="2" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" />
 					</Grid>
 				</ControlTemplate>
 			</Setter.Value>
@@ -13070,7 +13040,7 @@
 	<Style BasedOn="{StaticResource ListBoxBaseStyle}" TargetType="ListBox" />
 	<Style x:Key="ListBoxItemBaseStyle.Small" BasedOn="{StaticResource ListBoxItemBaseStyle}" TargetType="ListBoxItem">
 		<Setter Property="Padding" Value="6,0" />
-		<Setter Property="MinHeight" Value="20" />
+		<Setter Property="MinHeight" Value="24" />
 	</Style>
 	<Style x:Key="ListBox.Small" BasedOn="{StaticResource ListBoxBaseStyle}" TargetType="ListBox">
 		<Setter Property="ItemContainerStyle" Value="{StaticResource ListBoxItemBaseStyle.Small}" />
@@ -14041,11 +14011,54 @@
 	<Style BasedOn="{StaticResource ToolBarBaseStyle}" TargetType="ToolBar" />
 	<Style BasedOn="{StaticResource ToolTipBaseStyle}" TargetType="ToolTip" />
 	<Style BasedOn="{StaticResource TransferBaseStyle}" TargetType="hc:Transfer" />
+	<Style x:Key="TransferItemBaseStyle.Small" BasedOn="{StaticResource TransferItemBaseStyle}" TargetType="hc:TransferItem">
+		<Setter Property="Padding" Value="6 0" />
+		<Setter Property="MinHeight" Value="24" />
+	</Style>
+	<Style x:Key="Transfer.Small" BasedOn="{StaticResource TransferBaseStyle}" TargetType="hc:Transfer">
+		<Setter Property="ItemContainerStyle" Value="{StaticResource TransferItemBaseStyle.Small}" />
+	</Style>
+	<Style x:Key="TransferItemBaseStyle.CheckBox" BasedOn="{StaticResource BaseStyle}" TargetType="hc:TransferItem">
+		<Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisualMargin0}" />
+		<Setter Property="HorizontalContentAlignment" Value="Stretch" />
+		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+		<Setter Property="Padding" Value="{StaticResource DefaultControlPadding}" />
+		<Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="hc:TransferItem">
+					<Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{Binding Padding,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource ThicknessSplitConverter},ConverterParameter='1,0,1,0'}" SnapsToDevicePixels="true">
+						<CheckBox Foreground="{TemplateBinding Foreground}" HorizontalAlignment="Stretch" MinHeight="{TemplateBinding MinHeight}" FocusVisualStyle="{x:Null}" IsChecked="{Binding IsSelected,RelativeSource={RelativeSource TemplatedParent},Mode=TwoWay}">
+							<ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+						</CheckBox>
+					</Border>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+		<Style.Triggers>
+			<Trigger Property="IsMouseOver" Value="True">
+				<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+			</Trigger>
+			<Trigger Property="IsTransferred" Value="True">
+				<Setter Property="Visibility" Value="Collapsed" />
+			</Trigger>
+		</Style.Triggers>
+	</Style>
+	<Style x:Key="Transfer.CheckBox" BasedOn="{StaticResource TransferBaseStyle}" TargetType="hc:Transfer">
+		<Setter Property="ItemContainerStyle" Value="{StaticResource TransferItemBaseStyle.CheckBox}" />
+	</Style>
+	<Style x:Key="TransferItemBaseStyle.CheckBox.Small" BasedOn="{StaticResource TransferItemBaseStyle.CheckBox}" TargetType="hc:TransferItem">
+		<Setter Property="Padding" Value="6 0" />
+		<Setter Property="MinHeight" Value="24" />
+	</Style>
+	<Style x:Key="Transfer.CheckBox.Small" BasedOn="{StaticResource TransferBaseStyle}" TargetType="hc:Transfer">
+		<Setter Property="ItemContainerStyle" Value="{StaticResource TransferItemBaseStyle.CheckBox.Small}" />
+	</Style>
 	<Style BasedOn="{StaticResource TreeViewItemBaseStyle}" TargetType="TreeViewItem" />
 	<Style BasedOn="{StaticResource TreeViewBaseStyle}" TargetType="TreeView" />
 	<Style x:Key="TreeViewItemBaseStyle.Small" BasedOn="{StaticResource TreeViewItemBaseStyle}" TargetType="TreeViewItem">
 		<Setter Property="Padding" Value="6,0" />
-		<Setter Property="MinHeight" Value="20" />
+		<Setter Property="MinHeight" Value="24" />
 	</Style>
 	<Style x:Key="TreeView.Small" BasedOn="{StaticResource TreeViewBaseStyle}" TargetType="TreeView">
 		<Setter Property="ItemContainerStyle" Value="{StaticResource TreeViewItemBaseStyle.Small}" />
diff --git a/src/Shared/HandyControlDemo_Shared/MainWindow.xaml b/src/Shared/HandyControlDemo_Shared/MainWindow.xaml
index 252120c3..0f0decce 100644
--- a/src/Shared/HandyControlDemo_Shared/MainWindow.xaml
+++ b/src/Shared/HandyControlDemo_Shared/MainWindow.xaml
@@ -1,19 +1,20 @@
 <hc:GlowWindow x:Class="HandyControlDemo.MainWindow"
-           xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-           xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-           xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-           xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-           xmlns:hc="https://handyorg.github.io/handycontrol"
-           mc:Ignorable="d"
-           Title="HandyControlDemo"
-           ShowTitle="False"
-           Style="{StaticResource WindowGlow}"
-           Background="{DynamicResource SecondaryRegionBrush}"
-           ActiveGlowColor="{DynamicResource PrimaryColor}"
-           ResizeMode="CanResizeWithGrip"
-           WindowStartupLocation="CenterScreen"
-           d:DesignHeight="800" 
-           d:DesignWidth="1400" 
-           Icon="/HandyControlDemo;component/Resources/Img/icon.ico">
+               xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+               xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+               xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+               xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+               xmlns:hc="https://handyorg.github.io/handycontrol"
+               mc:Ignorable="d"
+               Title="HandyControlDemo"
+               ShowTitle="False"
+               Style="{StaticResource WindowGlow}"
+               Background="{DynamicResource SecondaryRegionBrush}"
+               ActiveGlowColor="{DynamicResource PrimaryColor}"
+               ResizeMode="CanResizeWithGrip"
+               WindowStartupLocation="CenterScreen"
+               d:DesignHeight="800" 
+               d:DesignWidth="1400"
+               hc:Empty.ShowEmpty="True"
+               Icon="/HandyControlDemo;component/Resources/Img/icon.ico">
     <ContentControl Name="ControlMain"/>
 </hc:GlowWindow>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TransferDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TransferDemoCtl.xaml
index ff19fa3e..e522e009 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TransferDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TransferDemoCtl.xaml
@@ -4,12 +4,13 @@
              Background="{DynamicResource RegionBrush}"
              xmlns:hc="https://handyorg.github.io/handycontrol">
     <hc:TransitioningContentControl>
-        <hc:Transfer ItemsSource="{Binding DataList}" Margin="32" Height="300">
-            <hc:Transfer.ItemTemplate>
-                <DataTemplate>
-                    <TextBlock Text="{Binding Name}"/>
-                </DataTemplate>
-            </hc:Transfer.ItemTemplate>
-        </hc:Transfer>
+        <hc:ScrollViewer IsInertiaEnabled="True">
+            <hc:UniformSpacingPanel ChildWrapping="Wrap" Margin="32" Spacing="32">
+                <hc:Transfer ItemsSource="{Binding DataList}" MinWidth="300" Height="300" DisplayMemberPath="Name" />
+                <hc:Transfer ItemsSource="{Binding DataList}" MinWidth="300" Height="300" DisplayMemberPath="Name" Style="{StaticResource Transfer.Small}"/>
+                <hc:Transfer ItemsSource="{Binding DataList}" MinWidth="300" Height="300" DisplayMemberPath="Name" Style="{StaticResource Transfer.CheckBox}"/>
+                <hc:Transfer ItemsSource="{Binding DataList}" MinWidth="300" Height="300" DisplayMemberPath="Name" Style="{StaticResource Transfer.CheckBox.Small}"/>
+            </hc:UniformSpacingPanel>
+        </hc:ScrollViewer>
     </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControl_Shared/Controls/Transfer/Transfer.cs b/src/Shared/HandyControl_Shared/Controls/Transfer/Transfer.cs
index 2241e739..6786c16a 100644
--- a/src/Shared/HandyControl_Shared/Controls/Transfer/Transfer.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Transfer/Transfer.cs
@@ -1,288 +1,120 @@
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Collections.Specialized;
+using System.ComponentModel;
 using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Data;
 using System.Windows.Input;
+using HandyControl.Data;
 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
+[TemplatePart(Name = ElementSelectedListBox, Type = typeof(ListBox))]
+[DefaultEvent(nameof(Transferred))]
+public class Transfer : ListBox
 {
-    private const string ElementItemsOrigin = "PART_ItemsOrigin";
+    private const string ElementSelectedListBox = "PART_SelectedListBox";
 
-    private const string ElementItemsSelected = "PART_ItemsSelected";
+    public static readonly RoutedEvent TransferredEvent =
+        EventManager.RegisterRoutedEvent("Transferred", RoutingStrategy.Bubble,
+            typeof(RoutedEventHandler), typeof(Transfer));
 
-    private readonly Dictionary<object, TransferEntry> _entryDic = new();
-
-    private readonly List<TransferEntry> _entryList = new();
-
-    private SimpleItemsControl _itemsOrigin;
-
-    private SimpleItemsControl _itemsSelected;
-
-    private IEnumerable _itemsSourceInternal;
-
-    private IEnumerable _initEnumerable;
-
-    private NotifyCollectionChangedEventArgs _initArgs;
-
-    public static readonly RoutedEvent SelectionChangedEvent =
-        EventManager.RegisterRoutedEvent("SelectionChanged", RoutingStrategy.Bubble,
-            typeof(SelectionChangedEventHandler), typeof(Transfer));
-
-    public event SelectionChangedEventHandler SelectionChanged
+    [Category("Behavior")]
+    public event RoutedEventHandler Transferred
     {
-        add => AddHandler(SelectionChangedEvent, value);
-        remove => RemoveHandler(SelectionChangedEvent, value);
+        add => AddHandler(TransferredEvent, value);
+        remove => RemoveHandler(TransferredEvent, 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);
-    }
+    private ListBox _selectedListBox;
 
     public Transfer()
     {
         CommandBindings.Add(new CommandBinding(ControlCommands.Selected, SelectItems));
         CommandBindings.Add(new CommandBinding(ControlCommands.Cancel, DeselectItems));
+        Loaded += OnLoaded;
+    }
 
-        SetValue(SelectedItemsPropertyKey, new ObservableCollection<object>());
+    private void OnLoaded(object sender, RoutedEventArgs e)
+    {
+        SelectItems(null, null);
     }
 
     public override void OnApplyTemplate()
     {
-        _itemsOrigin?.ItemsHost.Children.Clear();
-        _itemsSelected?.ItemsHost.Children.Clear();
+        base.OnApplyTemplate();
 
-        _itemsOrigin = GetTemplateChild(ElementItemsOrigin) as SimpleItemsControl;
-        _itemsSelected = GetTemplateChild(ElementItemsSelected) as SimpleItemsControl;
-
-        if (_itemsOrigin != null && _itemsSelected != null)
-        {
-            if (_initEnumerable != null)
-            {
-                OnItemsSourceChanged(null, _initEnumerable);
-                _initEnumerable = null;
-            }
-
-            if (_initArgs != null)
-            {
-                InternalCollectionChanged(null, _initArgs);
-                _initArgs = null;
-            }
-
-            if (_itemsOrigin.Items.Count == 0)
-            {
-                Refresh();
-            }
-        }
+        _selectedListBox = GetTemplateChild(ElementSelectedListBox) as ListBox;
     }
 
-    private void InsertItem(int index, object item, bool isTransferred = false)
+    protected virtual void OnTransferred(RoutedEventArgs e)
     {
-        var origin = new TransferItem
-        {
-            Content = item,
-            IsTransferred = isTransferred
-        };
-        var selected = new TransferItem
-        {
-            Content = item,
-            IsOrigin = false,
-            IsTransferred = isTransferred
-        };
-        var entry = new TransferEntry
-        {
-            OriginItem = origin,
-            SelectedItem = selected
-        };
-        _entryDic.Add(item, entry);
-        _entryList.Insert(index, entry);
-        _itemsOrigin.Items.Insert(index, origin);
-        _itemsSelected.Items.Insert(index, selected);
+        RaiseEvent(e);
     }
 
-    private void AddItem(object item) => InsertItem(_entryDic.Count, item);
-
-    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);
-            _entryList.Remove(entry);
-        }
-    }
-
-    private void ClearItems()
-    {
-        _entryDic.Clear();
-        _entryList.Clear();
-        _itemsOrigin.Items.Clear();
-        _itemsSelected.Items.Clear();
-    }
-
-    protected override void OnItemsSourceChanged(IEnumerable oldValue, IEnumerable newValue)
-    {
-        if (_itemsOrigin == null || _itemsSelected == null)
-        {
-            _initEnumerable = newValue;
-            return;
-        }
-
-        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 (_itemsOrigin == null || _itemsSelected == null)
-        {
-            _initArgs = e;
-            return;
-        }
-
-        switch (e.Action)
-        {
-            case NotifyCollectionChangedAction.Add:
-                if (e.NewItems != null)
-                {
-                    foreach (var item in e.NewItems)
-                    {
-                        AddItem(item);
-                    }
-                }
-                break;
-            case NotifyCollectionChangedAction.Remove:
-                if (e.OldItems != null)
-                {
-                    foreach (var item in e.OldItems)
-                    {
-                        RemoveItem(item);
-                    }
-                }
-                break;
-            case NotifyCollectionChangedAction.Replace:
-            case NotifyCollectionChangedAction.Move:
-                if (e.OldItems != null && e.NewItems != null)
-                {
-                    var oldItem = e.OldItems[0];
-                    if (_entryDic.TryGetValue(oldItem, out var entry))
-                    {
-                        var isTransferred = entry.SelectedItem.IsTransferred;
-                        RemoveItem(oldItem);
-                        InsertItem(e.NewStartingIndex, e.NewItems[0], isTransferred);
-                    }
-                }
-                break;
-            case NotifyCollectionChangedAction.Reset:
-                ClearItems();
-                break;
-        }
-    }
-
-    protected override DependencyObject GetContainerForItemOverride() => new TransferItem();
-
     protected override bool IsItemItsOwnContainerOverride(object item) => item is TransferItem;
 
+    protected override DependencyObject GetContainerForItemOverride() => new 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));
+        if (_selectedListBox == null)
+        {
+            return;
+        }
+
+        foreach (var item in SelectedItems)
+        {
+            if (ItemContainerGenerator.ContainerFromItem(item) is not TransferItem { IsTransferred: false } selectedItem)
+            {
+                continue;
+            }
+
+            selectedItem.IsTransferred = true;
+
+            var transferItem = new TransferItem
+            {
+                Tag = item
+            };
+
+            if (ItemsSource != null)
+            {
+                transferItem.SetBinding(ContentControl.ContentProperty, new Binding(DisplayMemberPath) { Source = item });
+            }
+            else
+            {
+                transferItem.Content = IsItemItsOwnContainerOverride(item) ? ((TransferItem) item).Content : item;
+            }
+
+            _selectedListBox.Items.Add(transferItem);
+        }
+
+        OnTransferred(new RoutedEventArgs(TransferredEvent, this));
     }
 
     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 (_entryList.Count > 0)
+        if (_selectedListBox == null)
         {
-            _entryList.Select(item => item.OriginItem).Do(item => _itemsOrigin.Items.Add(item));
-            _entryList.Select(item => item.SelectedItem).Do(item => _itemsSelected.Items.Add(item));
+            return;
         }
-    }
 
-    private struct TransferEntry
-    {
-        public TransferItem OriginItem { get; set; }
-
-        public TransferItem SelectedItem { get; set; }
-
-        public void StatusSwitch(bool isTransferred)
+        foreach (var transferItem in _selectedListBox.Items.OfType<TransferItem>().ToList())
         {
-            if (isTransferred)
+            if (!transferItem.IsSelected)
             {
-                OriginItem.IsTransferred = true;
-                SelectedItem.IsTransferred = true;
-                OriginItem.IsSelected = false;
+                continue;
             }
-            else
+
+            if (ItemContainerGenerator.ContainerFromItem(transferItem.Tag) is TransferItem selectedItem)
             {
-                OriginItem.IsTransferred = false;
-                SelectedItem.IsTransferred = false;
-                SelectedItem.IsSelected = false;
+                _selectedListBox.Items.Remove(transferItem);
+
+                selectedItem.SetCurrentValue(TransferItem.IsTransferredProperty, ValueBoxes.FalseBox);
+                selectedItem.SetCurrentValue(ListBoxItem.IsSelectedProperty, ValueBoxes.FalseBox);
             }
         }
+
+        OnTransferred(new RoutedEventArgs(TransferredEvent, this));
     }
 }
diff --git a/src/Shared/HandyControl_Shared/Controls/Transfer/TransferGroup.cs b/src/Shared/HandyControl_Shared/Controls/Transfer/TransferGroup.cs
deleted file mode 100644
index c227e555..00000000
--- a/src/Shared/HandyControl_Shared/Controls/Transfer/TransferGroup.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-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;
-
-        switch (e.Action)
-        {
-            case NotifyCollectionChangedAction.Add:
-                if (e.NewItems != null)
-                {
-                    if (e.NewItems[0] is FrameworkElement item)
-                    {
-                        item.Style = ItemContainerStyle;
-                        ItemsHost.Children.Insert(e.NewStartingIndex, item);
-                    }
-                }
-                break;
-            case NotifyCollectionChangedAction.Remove:
-                if (e.OldItems != null)
-                {
-                    foreach (FrameworkElement item in e.OldItems)
-                    {
-                        ItemsHost.Children.Remove(item);
-                    }
-                }
-                break;
-            case NotifyCollectionChangedAction.Reset:
-                ItemsHost.Children.Clear();
-                break;
-        }
-    }
-}
diff --git a/src/Shared/HandyControl_Shared/Controls/Transfer/TransferItem.cs b/src/Shared/HandyControl_Shared/Controls/Transfer/TransferItem.cs
index 8d30d7c8..b9167ddf 100644
--- a/src/Shared/HandyControl_Shared/Controls/Transfer/TransferItem.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Transfer/TransferItem.cs
@@ -1,9 +1,10 @@
 using System.Windows;
+using System.Windows.Controls;
 using HandyControl.Data;
 
 namespace HandyControl.Controls;
 
-public class TransferItem : SelectableItem
+public class TransferItem : ListBoxItem
 {
     public static readonly DependencyProperty IsTransferredProperty = DependencyProperty.Register(
         nameof(IsTransferred), typeof(bool), typeof(TransferItem), new PropertyMetadata(ValueBoxes.FalseBox));
@@ -13,13 +14,4 @@ public class TransferItem : SelectableItem
         get => (bool) GetValue(IsTransferredProperty);
         set => SetValue(IsTransferredProperty, ValueBoxes.BooleanBox(value));
     }
-
-    public static readonly DependencyProperty IsOriginProperty = DependencyProperty.Register(
-        nameof(IsOrigin), typeof(bool), typeof(TransferItem), new PropertyMetadata(ValueBoxes.TrueBox));
-
-    public bool IsOrigin
-    {
-        get => (bool) GetValue(IsOriginProperty);
-        internal set => SetValue(IsOriginProperty, ValueBoxes.BooleanBox(value));
-    }
 }
diff --git a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
index 0d7d650f..bac2ffb4 100644
--- a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
+++ b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
@@ -255,7 +255,6 @@
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Time\TimeBar\SpeTextBlock.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Time\TimeBar\TimeBar.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Transfer\Transfer.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Controls\Transfer\TransferGroup.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Transfer\TransferItem.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Window\BlurWindow.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Window\ImageBrowser.cs" />
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/TransferBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/TransferBaseStyle.xaml
index 96c7a71d..ae9bb748 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/TransferBaseStyle.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/TransferBaseStyle.xaml
@@ -4,81 +4,39 @@
                     xmlns:interactivity="clr-namespace:HandyControl.Interactivity">
 
     <Style x:Key="TransferItemBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="hc:TransferItem">
-        <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisualMargin0}"/>
-        <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="FocusVisualStyle" Value="{StaticResource FocusVisualMargin0}" />
+        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+        <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+        <Setter Property="Padding" Value="{StaticResource DefaultControlPadding}" />
+        <Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="hc:TransferItem">
-                    <Border x:Name="BorderRoot" Background="{DynamicResource RegionBrush}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}">
-                        <ContentPresenter x:Name="ContentPresenter" VerticalAlignment="Center" Margin="{TemplateBinding Padding}" ContentTemplate="{Binding ItemTemplate,RelativeSource={RelativeSource AncestorType=hc:TransferGroup}}"/>
+                    <Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{Binding Padding,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource ThicknessSplitConverter},ConverterParameter='1,0,1,0'}" SnapsToDevicePixels="true">
+                        <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
                     </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>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}"/>
+            </Trigger>
+            <Trigger Property="IsSelected" Value="True">
+                <Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
+                <Setter Property="TextElement.Foreground" Value="{DynamicResource TextIconBrush}" />
+            </Trigger>
+            <Trigger Property="IsTransferred" Value="True">
+                <Setter Property="Visibility" Value="Collapsed" />
+            </Trigger>
         </Style.Triggers>
     </Style>
 
-    <Style x:Key="TransferGroupBaseStyle" TargetType="hc:TransferGroup">
-        <Setter Property="Focusable" Value="False"/>
-        <Setter Property="BorderThickness" Value="0"/>
-        <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}"/>
-        <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="hc:TransferGroup">
-                    <Border Background="{TemplateBinding Background}" CornerRadius="{Binding Path=(hc: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="hc:Transfer">
         <Setter Property="Focusable" Value="False"/>
         <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="Padding" Value="2" />
+        <Setter Property="SelectionMode" Value="Extended"/>
         <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}"/>
         <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
         <Setter Property="ItemContainerStyle" Value="{StaticResource TransferItemBaseStyle}"/>
@@ -87,9 +45,9 @@
                 <ControlTemplate TargetType="hc:Transfer">
                     <Grid>
                         <Grid.ColumnDefinitions>
-                            <ColumnDefinition MinWidth="200"/>
+                            <ColumnDefinition />
                             <ColumnDefinition Width="Auto"/>
-                            <ColumnDefinition MinWidth="200"/>
+                            <ColumnDefinition />
                         </Grid.ColumnDefinitions>
                         <Grid.RowDefinitions>
                             <RowDefinition/>
@@ -97,12 +55,23 @@
                             <RowDefinition/>
                             <RowDefinition/>
                         </Grid.RowDefinitions>
-                        <hc: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">
+                        <Border Grid.RowSpan="4" Background="{TemplateBinding Background}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
+                            <hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
+                                <hc:ToggleBlock.CheckedContent>
+                                    <hc:ScrollViewer IsInertiaEnabled="{Binding Path=(hc:ScrollViewer.IsInertiaEnabled),RelativeSource={RelativeSource TemplatedParent}}" CanContentScroll="false" Focusable="false" HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
+                                        <ItemsPresenter />
+                                    </hc:ScrollViewer>
+                                </hc:ToggleBlock.CheckedContent>
+                                <hc:ToggleBlock.UnCheckedContent>
+                                    <hc:Empty />
+                                </hc:ToggleBlock.UnCheckedContent>
+                            </hc:ToggleBlock>
+                        </Border>
+                        <StackPanel Margin="8,0" VerticalAlignment="Center" HorizontalAlignment="Center" Grid.Row="0" Grid.RowSpan="4" Grid.Column="1">
                             <Button hc:IconElement.Geometry="{StaticResource LeftGeometry}" Command="interactivity:ControlCommands.Cancel"/>
-                            <Button hc:IconElement.Geometry="{StaticResource RightGeometry}" Margin="0,10,0,0" Command="interactivity:ControlCommands.Selected"/>
+                            <Button hc:IconElement.Geometry="{StaticResource RightGeometry}" Margin="0,8,0,0" Command="interactivity:ControlCommands.Selected"/>
                         </StackPanel>
-                        <hc:TransferGroup x:Name="PART_ItemsSelected" Style="{StaticResource TransferGroupBaseStyle}" Grid.Row="0" Grid.RowSpan="4" Grid.Column="2" ItemTemplate="{TemplateBinding ItemTemplate}" ItemContainerStyle="{TemplateBinding ItemContainerStyle}"/>
+                        <ListBox x:Name="PART_SelectedListBox" Padding="{TemplateBinding Padding}" SelectionMode="{TemplateBinding SelectionMode}" ItemContainerStyle="{TemplateBinding ItemContainerStyle}" ItemsPanel="{TemplateBinding ItemsPanel}" Grid.Row="0" Grid.RowSpan="4" Grid.Column="2" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" />
                     </Grid>
                 </ControlTemplate>
             </Setter.Value>
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/ListBox.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/ListBox.xaml
index 4eb8c0c4..d8940a9a 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/ListBox.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/ListBox.xaml
@@ -6,7 +6,7 @@
 
     <Style x:Key="ListBoxItemBaseStyle.Small" BasedOn="{StaticResource ListBoxItemBaseStyle}" TargetType="ListBoxItem">
         <Setter Property="Padding" Value="6,0"/>
-        <Setter Property="MinHeight" Value="20"/>
+        <Setter Property="MinHeight" Value="24"/>
     </Style>
 
     <Style x:Key="ListBox.Small" BasedOn="{StaticResource ListBoxBaseStyle}" TargetType="ListBox">
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Transfer.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Transfer.xaml
index d3095c49..a48a3d7c 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Transfer.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Transfer.xaml
@@ -1,6 +1,56 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:hc="clr-namespace:HandyControl.Controls">
 
     <Style BasedOn="{StaticResource TransferBaseStyle}" TargetType="hc:Transfer"/>
+
+    <Style x:Key="TransferItemBaseStyle.Small" BasedOn="{StaticResource TransferItemBaseStyle}" TargetType="hc:TransferItem">
+        <Setter Property="Padding" Value="6 0" />
+        <Setter Property="MinHeight" Value="24" />
+    </Style>
+
+    <Style x:Key="Transfer.Small" BasedOn="{StaticResource TransferBaseStyle}" TargetType="hc:Transfer">
+        <Setter Property="ItemContainerStyle" Value="{StaticResource TransferItemBaseStyle.Small}" />
+    </Style>
+
+    <Style x:Key="TransferItemBaseStyle.CheckBox" BasedOn="{StaticResource BaseStyle}" TargetType="hc:TransferItem">
+        <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisualMargin0}" />
+        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+        <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+        <Setter Property="Padding" Value="{StaticResource DefaultControlPadding}" />
+        <Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="hc:TransferItem">
+                    <Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{Binding Padding,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource ThicknessSplitConverter},ConverterParameter='1,0,1,0'}" SnapsToDevicePixels="true">
+                        <CheckBox Foreground="{TemplateBinding Foreground}" HorizontalAlignment="Stretch" MinHeight="{TemplateBinding MinHeight}" FocusVisualStyle="{x:Null}" IsChecked="{Binding IsSelected,RelativeSource={RelativeSource TemplatedParent},Mode=TwoWay}">
+                            <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+                        </CheckBox>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Style.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+            </Trigger>
+            <Trigger Property="IsTransferred" Value="True">
+                <Setter Property="Visibility" Value="Collapsed" />
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+    <Style x:Key="Transfer.CheckBox" BasedOn="{StaticResource TransferBaseStyle}" TargetType="hc:Transfer">
+        <Setter Property="ItemContainerStyle" Value="{StaticResource TransferItemBaseStyle.CheckBox}" />
+    </Style>
     
+    <Style x:Key="TransferItemBaseStyle.CheckBox.Small" BasedOn="{StaticResource TransferItemBaseStyle.CheckBox}" TargetType="hc:TransferItem">
+        <Setter Property="Padding" Value="6 0" />
+        <Setter Property="MinHeight" Value="24" />
+    </Style>
+
+    <Style x:Key="Transfer.CheckBox.Small" BasedOn="{StaticResource TransferBaseStyle}" TargetType="hc:Transfer">
+        <Setter Property="ItemContainerStyle" Value="{StaticResource TransferItemBaseStyle.CheckBox.Small}" />
+    </Style>
+
 </ResourceDictionary>
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/TreeView.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/TreeView.xaml
index 2c98f2d5..431ce041 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/TreeView.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/TreeView.xaml
@@ -7,7 +7,7 @@
 
     <Style x:Key="TreeViewItemBaseStyle.Small" BasedOn="{StaticResource TreeViewItemBaseStyle}" TargetType="TreeViewItem">
         <Setter Property="Padding" Value="6,0"/>
-        <Setter Property="MinHeight" Value="20"/>
+        <Setter Property="MinHeight" Value="24"/>
     </Style>
 
     <Style x:Key="TreeView.Small" BasedOn="{StaticResource TreeViewBaseStyle}" TargetType="TreeView">
diff --git a/src/Shared/HandyControl_Shared/Themes/Theme.xaml b/src/Shared/HandyControl_Shared/Themes/Theme.xaml
index 5107cc00..dc05006e 100644
--- a/src/Shared/HandyControl_Shared/Themes/Theme.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Theme.xaml
@@ -11891,77 +11891,36 @@
 	<Style x:Key="TransferItemBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="hc:TransferItem">
 		<Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisualMargin0}" />
 		<Setter Property="HorizontalContentAlignment" Value="Stretch" />
-		<Setter Property="CanDeselect" Value="True" />
-		<Setter Property="SelfManage" Value="True" />
-		<Setter Property="Padding" Value="10, 0" />
+		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+		<Setter Property="Padding" Value="{StaticResource DefaultControlPadding}" />
 		<Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
-		<Setter Property="Margin" Value="5,0,5,5" />
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="hc:TransferItem">
-					<Border x:Name="BorderRoot" Background="{DynamicResource RegionBrush}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}">
-						<ContentPresenter x:Name="ContentPresenter" VerticalAlignment="Center" Margin="{TemplateBinding Padding}" ContentTemplate="{Binding ItemTemplate,RelativeSource={RelativeSource AncestorType=hc:TransferGroup}}" />
+					<Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{Binding Padding,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource ThicknessSplitConverter},ConverterParameter='1,0,1,0'}" SnapsToDevicePixels="true">
+						<ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
 					</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>
+			<Trigger Property="IsMouseOver" Value="True">
+				<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+			</Trigger>
+			<Trigger Property="IsSelected" Value="True">
+				<Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
+				<Setter Property="TextElement.Foreground" Value="{DynamicResource TextIconBrush}" />
+			</Trigger>
+			<Trigger Property="IsTransferred" Value="True">
 				<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>
+			</Trigger>
 		</Style.Triggers>
 	</Style>
-	<Style x:Key="TransferGroupBaseStyle" TargetType="hc:TransferGroup">
-		<Setter Property="Focusable" Value="False" />
-		<Setter Property="BorderThickness" Value="0" />
-		<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="hc:TransferGroup">
-					<Border Background="{TemplateBinding Background}" CornerRadius="{Binding Path=(hc: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="hc:Transfer">
 		<Setter Property="Focusable" Value="False" />
 		<Setter Property="BorderThickness" Value="1" />
+		<Setter Property="Padding" Value="2" />
+		<Setter Property="SelectionMode" Value="Extended" />
 		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
 		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
 		<Setter Property="ItemContainerStyle" Value="{StaticResource TransferItemBaseStyle}" />
@@ -11980,12 +11939,16 @@
 							<RowDefinition />
 							<RowDefinition />
 						</Grid.RowDefinitions>
-						<hc:TransferGroup x:Name="PART_ItemsOrigin" Style="{StaticResource TransferGroupBaseStyle}" Grid.RowSpan="4" ItemTemplate="{TemplateBinding ItemTemplate}" ItemContainerStyle="{TemplateBinding ItemContainerStyle}" />
+						<Border Grid.RowSpan="4" Background="{TemplateBinding Background}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
+							<hc:ScrollViewer IsInertiaEnabled="{Binding Path=(hc:ScrollViewer.IsInertiaEnabled),RelativeSource={RelativeSource TemplatedParent}}" CanContentScroll="false" Focusable="false" HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
+								<ItemsPresenter />
+							</hc:ScrollViewer>
+						</Border>
 						<StackPanel Margin="32,0" VerticalAlignment="Center" HorizontalAlignment="Center" Grid.Row="0" Grid.RowSpan="4" Grid.Column="1">
 							<Button hc:IconElement.Geometry="{StaticResource LeftGeometry}" Command="interactivity:ControlCommands.Cancel" />
 							<Button hc:IconElement.Geometry="{StaticResource RightGeometry}" Margin="0,10,0,0" Command="interactivity:ControlCommands.Selected" />
 						</StackPanel>
-						<hc:TransferGroup x:Name="PART_ItemsSelected" Style="{StaticResource TransferGroupBaseStyle}" Grid.Row="0" Grid.RowSpan="4" Grid.Column="2" ItemTemplate="{TemplateBinding ItemTemplate}" ItemContainerStyle="{TemplateBinding ItemContainerStyle}" />
+						<ListBox x:Name="PART_SelectedListBox" Padding="{TemplateBinding Padding}" SelectionMode="{TemplateBinding SelectionMode}" ItemContainerStyle="{TemplateBinding ItemContainerStyle}" ItemsPanel="{TemplateBinding ItemsPanel}" Grid.Row="0" Grid.RowSpan="4" Grid.Column="2" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" />
 					</Grid>
 				</ControlTemplate>
 			</Setter.Value>
@@ -13211,7 +13174,7 @@
 	<Style BasedOn="{StaticResource ListBoxBaseStyle}" TargetType="ListBox" />
 	<Style x:Key="ListBoxItemBaseStyle.Small" BasedOn="{StaticResource ListBoxItemBaseStyle}" TargetType="ListBoxItem">
 		<Setter Property="Padding" Value="6,0" />
-		<Setter Property="MinHeight" Value="20" />
+		<Setter Property="MinHeight" Value="24" />
 	</Style>
 	<Style x:Key="ListBox.Small" BasedOn="{StaticResource ListBoxBaseStyle}" TargetType="ListBox">
 		<Setter Property="ItemContainerStyle" Value="{StaticResource ListBoxItemBaseStyle.Small}" />
@@ -14189,11 +14152,54 @@
 	<Style BasedOn="{StaticResource ToolBarBaseStyle}" TargetType="ToolBar" />
 	<Style BasedOn="{StaticResource ToolTipBaseStyle}" TargetType="ToolTip" />
 	<Style BasedOn="{StaticResource TransferBaseStyle}" TargetType="hc:Transfer" />
+	<Style x:Key="TransferItemBaseStyle.Small" BasedOn="{StaticResource TransferItemBaseStyle}" TargetType="hc:TransferItem">
+		<Setter Property="Padding" Value="6 0" />
+		<Setter Property="MinHeight" Value="24" />
+	</Style>
+	<Style x:Key="Transfer.Small" BasedOn="{StaticResource TransferBaseStyle}" TargetType="hc:Transfer">
+		<Setter Property="ItemContainerStyle" Value="{StaticResource TransferItemBaseStyle.Small}" />
+	</Style>
+	<Style x:Key="TransferItemBaseStyle.CheckBox" BasedOn="{StaticResource BaseStyle}" TargetType="hc:TransferItem">
+		<Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisualMargin0}" />
+		<Setter Property="HorizontalContentAlignment" Value="Stretch" />
+		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+		<Setter Property="Padding" Value="{StaticResource DefaultControlPadding}" />
+		<Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="hc:TransferItem">
+					<Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{Binding Padding,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource ThicknessSplitConverter},ConverterParameter='1,0,1,0'}" SnapsToDevicePixels="true">
+						<CheckBox Foreground="{TemplateBinding Foreground}" HorizontalAlignment="Stretch" MinHeight="{TemplateBinding MinHeight}" FocusVisualStyle="{x:Null}" IsChecked="{Binding IsSelected,RelativeSource={RelativeSource TemplatedParent},Mode=TwoWay}">
+							<ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+						</CheckBox>
+					</Border>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+		<Style.Triggers>
+			<Trigger Property="IsMouseOver" Value="True">
+				<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+			</Trigger>
+			<Trigger Property="IsTransferred" Value="True">
+				<Setter Property="Visibility" Value="Collapsed" />
+			</Trigger>
+		</Style.Triggers>
+	</Style>
+	<Style x:Key="Transfer.CheckBox" BasedOn="{StaticResource TransferBaseStyle}" TargetType="hc:Transfer">
+		<Setter Property="ItemContainerStyle" Value="{StaticResource TransferItemBaseStyle.CheckBox}" />
+	</Style>
+	<Style x:Key="TransferItemBaseStyle.CheckBox.Small" BasedOn="{StaticResource TransferItemBaseStyle.CheckBox}" TargetType="hc:TransferItem">
+		<Setter Property="Padding" Value="6 0" />
+		<Setter Property="MinHeight" Value="24" />
+	</Style>
+	<Style x:Key="Transfer.CheckBox.Small" BasedOn="{StaticResource TransferBaseStyle}" TargetType="hc:Transfer">
+		<Setter Property="ItemContainerStyle" Value="{StaticResource TransferItemBaseStyle.CheckBox.Small}" />
+	</Style>
 	<Style BasedOn="{StaticResource TreeViewItemBaseStyle}" TargetType="TreeViewItem" />
 	<Style BasedOn="{StaticResource TreeViewBaseStyle}" TargetType="TreeView" />
 	<Style x:Key="TreeViewItemBaseStyle.Small" BasedOn="{StaticResource TreeViewItemBaseStyle}" TargetType="TreeViewItem">
 		<Setter Property="Padding" Value="6,0" />
-		<Setter Property="MinHeight" Value="20" />
+		<Setter Property="MinHeight" Value="24" />
 	</Style>
 	<Style x:Key="TreeView.Small" BasedOn="{StaticResource TreeViewBaseStyle}" TargetType="TreeView">
 		<Setter Property="ItemContainerStyle" Value="{StaticResource TreeViewItemBaseStyle.Small}" />