enhance: close #1275

This commit is contained in:
NaBian committed 2022-10-31 23:02:01 +08:00
1 parent dc1085e245
commit 4178b24758
1 file changed
+65 -17
@@ -1,33 +1,48 @@
using System.ComponentModel; using System.Collections;
using System.Collections.Generic;
using System.ComponentModel;
using System.Linq; using System.Linq;
using System.Windows; using System.Windows;
using System.Windows.Controls; using System.Windows.Controls;
using System.Windows.Data; using System.Windows.Data;
using System.Windows.Input; using System.Windows.Input;
using HandyControl.Collections;
using HandyControl.Data; using HandyControl.Data;
using HandyControl.Interactivity; using HandyControl.Interactivity;
namespace HandyControl.Controls; namespace HandyControl.Controls;
[TemplatePart(Name = ElementSelectedListBox, Type = typeof(ListBox))] [TemplatePart(Name = ElementSelectedListBox, Type = typeof(ListBox))]
[DefaultEvent(nameof(Transferred))] [DefaultEvent(nameof(TransferredItemsChanged))]
public class Transfer : ListBox public class Transfer : ListBox
{ {
private const string ElementSelectedListBox = "PART_SelectedListBox"; private const string ElementSelectedListBox = "PART_SelectedListBox";
public static readonly RoutedEvent TransferredEvent = public static readonly RoutedEvent TransferredItemsChangedEvent =
EventManager.RegisterRoutedEvent("Transferred", RoutingStrategy.Bubble, EventManager.RegisterRoutedEvent("TransferredItemsChanged", RoutingStrategy.Bubble,
typeof(RoutedEventHandler), typeof(Transfer)); typeof(SelectionChangedEventHandler), typeof(Transfer));
[Category("Behavior")] [Category("Behavior")]
public event RoutedEventHandler Transferred public event SelectionChangedEventHandler TransferredItemsChanged
{ {
add => AddHandler(TransferredEvent, value); add => AddHandler(TransferredItemsChangedEvent, value);
remove => RemoveHandler(TransferredEvent, value); remove => RemoveHandler(TransferredItemsChangedEvent, value);
} }
private ListBox _selectedListBox; private ListBox _selectedListBox;
private static readonly DependencyPropertyKey TransferredItemsPropertyKey =
DependencyProperty.RegisterReadOnly("TransferredItems", typeof(IList),
typeof(Transfer), new FrameworkPropertyMetadata((IList) null));
private static readonly DependencyProperty TransferredItemsImplProperty =
TransferredItemsPropertyKey.DependencyProperty;
[Bindable(true), Category("Appearance"), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
public IList TransferredItems => TransferredItemsImpl;
private IList TransferredItemsImpl => (IList) GetValue(TransferredItemsImplProperty);
public Transfer() public Transfer()
{ {
CommandBindings.Add(new CommandBinding(ControlCommands.Selected, SelectItems)); CommandBindings.Add(new CommandBinding(ControlCommands.Selected, SelectItems));
@@ -47,7 +62,7 @@ public class Transfer : ListBox
_selectedListBox = GetTemplateChild(ElementSelectedListBox) as ListBox; _selectedListBox = GetTemplateChild(ElementSelectedListBox) as ListBox;
} }
protected virtual void OnTransferred(RoutedEventArgs e) protected virtual void OnTransferredItemsChanged(SelectionChangedEventArgs e)
{ {
RaiseEvent(e); RaiseEvent(e);
} }
@@ -58,7 +73,7 @@ public class Transfer : ListBox
private void SelectItems(object sender, ExecutedRoutedEventArgs e) private void SelectItems(object sender, ExecutedRoutedEventArgs e)
{ {
if (_selectedListBox == null) if (_selectedListBox == null || SelectedItems.Count == 0)
{ {
return; return;
} }
@@ -89,7 +104,12 @@ public class Transfer : ListBox
_selectedListBox.Items.Add(transferItem); _selectedListBox.Items.Add(transferItem);
} }
OnTransferred(new RoutedEventArgs(TransferredEvent, this)); SetTransferredItems(_selectedListBox.Items.OfType<TransferItem>().Select(item => item.Tag));
OnTransferredItemsChanged(new SelectionChangedEventArgs(TransferredItemsChangedEvent, new List<object>(), SelectedItems)
{
Source = this
});
UnselectAll();
} }
private void DeselectItems(object sender, ExecutedRoutedEventArgs e) private void DeselectItems(object sender, ExecutedRoutedEventArgs e)
@@ -99,6 +119,7 @@ public class Transfer : ListBox
return; return;
} }
var deselectItems = new List<object>();
foreach (var transferItem in _selectedListBox.Items.OfType<TransferItem>().ToList()) foreach (var transferItem in _selectedListBox.Items.OfType<TransferItem>().ToList())
{ {
if (!transferItem.IsSelected) if (!transferItem.IsSelected)
@@ -106,15 +127,42 @@ public class Transfer : ListBox
continue; continue;
} }
if (ItemContainerGenerator.ContainerFromItem(transferItem.Tag) is TransferItem selectedItem) if (ItemContainerGenerator.ContainerFromItem(transferItem.Tag) is not TransferItem selectedItem)
{ {
_selectedListBox.Items.Remove(transferItem); continue;
selectedItem.SetCurrentValue(TransferItem.IsTransferredProperty, ValueBoxes.FalseBox);
selectedItem.SetCurrentValue(ListBoxItem.IsSelectedProperty, ValueBoxes.FalseBox);
} }
_selectedListBox.Items.Remove(transferItem);
deselectItems.Add(transferItem.Tag);
selectedItem.SetCurrentValue(TransferItem.IsTransferredProperty, ValueBoxes.FalseBox);
selectedItem.SetCurrentValue(ListBoxItem.IsSelectedProperty, ValueBoxes.FalseBox);
} }
OnTransferred(new RoutedEventArgs(TransferredEvent, this)); SetTransferredItems(_selectedListBox.Items.OfType<TransferItem>().Select(item => item.Tag));
OnTransferredItemsChanged(new SelectionChangedEventArgs(TransferredItemsChangedEvent, deselectItems, new List<object>())
{
Source = this
});
}
private void SetTransferredItems(IEnumerable selectedItems)
{
var oldSelectedItems = (ManualObservableCollection<object>) GetValue(TransferredItemsImplProperty);
if (oldSelectedItems == null)
{
oldSelectedItems = new ManualObservableCollection<object>();
SetValue(TransferredItemsPropertyKey, oldSelectedItems);
}
oldSelectedItems.CanNotify = false;
oldSelectedItems.Clear();
foreach (var selectedItem in selectedItems)
{
oldSelectedItems.Add(selectedItem);
}
oldSelectedItems.CanNotify = true;
} }
} }