fixed #446
This commit is contained in:
1 parent
c6fbffb32e
commit
c3ba2d5c96
2 files changed
+50
-23
No files matched your search
@@ -57,7 +57,7 @@ namespace HandyControl.Controls
|
|||||||
|
|
||||||
public IList SelectedItems
|
public IList SelectedItems
|
||||||
{
|
{
|
||||||
get => (IList) GetValue(SelectedItemsProperty);
|
get => (IList)GetValue(SelectedItemsProperty);
|
||||||
set => SetValue(SelectedItemsProperty, value);
|
set => SetValue(SelectedItemsProperty, value);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -98,16 +98,18 @@ namespace HandyControl.Controls
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void AddItem(object item)
|
private void InsertItem(int index, object item, bool isTransferred = false)
|
||||||
{
|
{
|
||||||
var origin = new TransferItem
|
var origin = new TransferItem
|
||||||
{
|
{
|
||||||
Content = item
|
Content = item,
|
||||||
|
IsTransferred = isTransferred
|
||||||
};
|
};
|
||||||
var selected = new TransferItem
|
var selected = new TransferItem
|
||||||
{
|
{
|
||||||
Content = item,
|
Content = item,
|
||||||
IsOrigin = false
|
IsOrigin = false,
|
||||||
|
IsTransferred = isTransferred
|
||||||
};
|
};
|
||||||
var entry = new TransferEntry
|
var entry = new TransferEntry
|
||||||
{
|
{
|
||||||
@@ -115,11 +117,13 @@ namespace HandyControl.Controls
|
|||||||
SelectedItem = selected
|
SelectedItem = selected
|
||||||
};
|
};
|
||||||
_entryDic.Add(item, entry);
|
_entryDic.Add(item, entry);
|
||||||
_entryList.Add(entry);
|
_entryList.Insert(index, entry);
|
||||||
_itemsOrigin.Items.Add(origin);
|
_itemsOrigin.Items.Insert(index, origin);
|
||||||
_itemsSelected.Items.Add(selected);
|
_itemsSelected.Items.Insert(index, selected);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void AddItem(object item) => InsertItem(_entryDic.Count, item);
|
||||||
|
|
||||||
private void RemoveItem(object item)
|
private void RemoveItem(object item)
|
||||||
{
|
{
|
||||||
if (_entryDic.TryGetValue(item, out var entry))
|
if (_entryDic.TryGetValue(item, out var entry))
|
||||||
@@ -178,19 +182,42 @@ namespace HandyControl.Controls
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (e.OldItems != null)
|
switch (e.Action)
|
||||||
{
|
{
|
||||||
foreach (var item in e.OldItems)
|
case NotifyCollectionChangedAction.Add:
|
||||||
{
|
if (e.NewItems != null)
|
||||||
RemoveItem(item);
|
{
|
||||||
}
|
foreach (var item in e.NewItems)
|
||||||
}
|
{
|
||||||
if (e.NewItems != null)
|
AddItem(item);
|
||||||
{
|
}
|
||||||
foreach (var item in e.NewItems)
|
}
|
||||||
{
|
break;
|
||||||
AddItem(item);
|
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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -219,12 +246,12 @@ namespace HandyControl.Controls
|
|||||||
|
|
||||||
protected override void OnItemTemplateChanged(DependencyPropertyChangedEventArgs e)
|
protected override void OnItemTemplateChanged(DependencyPropertyChangedEventArgs e)
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override void OnItemContainerStyleChanged(DependencyPropertyChangedEventArgs e)
|
protected override void OnItemContainerStyleChanged(DependencyPropertyChangedEventArgs e)
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override void Refresh()
|
protected override void Refresh()
|
||||||
|
|||||||
@@ -43,10 +43,10 @@ namespace HandyControl.Controls
|
|||||||
}
|
}
|
||||||
if (e.NewItems != null)
|
if (e.NewItems != null)
|
||||||
{
|
{
|
||||||
foreach (FrameworkElement item in e.NewItems)
|
if (e.NewItems[0] is FrameworkElement item)
|
||||||
{
|
{
|
||||||
item.Style = ItemContainerStyle;
|
item.Style = ItemContainerStyle;
|
||||||
ItemsHost.Children.Add(item);
|
ItemsHost.Children.Insert(e.NewStartingIndex, item);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in new issue
Block a user