Skip to content
This repository has been archived by the owner on Sep 4, 2024. It is now read-only.

[WPF] fixes a multiple call to OnSelectedItemsChanged in TreeView #1030

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 48 additions & 1 deletion Xwt.WPF/Xwt.WPFBackend/ExTreeView.cs
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ namespace Xwt.WPFBackend
public class ExTreeView
: SWC.TreeView, IWpfWidget
{
int deferSelectionChange = 0;
IList oldSelectedItems;

public ExTreeView()
{
SelectedItems = new ObservableCollection<object> ();
Expand Down Expand Up @@ -217,8 +220,50 @@ private ExTreeViewItem GetTreeItem (object item)
private static readonly PropertyInfo IsSelectionChangeActiveProperty =
typeof (System.Windows.Controls.TreeView).GetProperty ("IsSelectionChangeActive", BindingFlags.NonPublic | BindingFlags.Instance);

void BeginDeferSelectionChanged()
{
if (deferSelectionChange == 0)
{
oldSelectedItems = new List<object>(SelectedItems.Count);
foreach (var item in SelectedItems)
{
oldSelectedItems.Add(item);
}
}
deferSelectionChange++;
}

bool SelectionIsRealChanged()
{
if (oldSelectedItems == null || SelectedItems.Count != oldSelectedItems.Count)
return true;

for (var i = 0; i < SelectedItems.Count; i++)
{
if (SelectedItems[i] != oldSelectedItems[i])
{
return true;
}
}
return false;
}

void EndDeferSelectionChanged()
{
if (deferSelectionChange > 0)
{
deferSelectionChange--;

if (deferSelectionChange == 0 && SelectionIsRealChanged())
{
OnSelectedItemsChanged(EventArgs.Empty);
}
}
}

private void SelectedItemsCollectionChanged (object sender, NotifyCollectionChangedEventArgs e)
{
BeginDeferSelectionChanged();
bool changeActive = (bool)IsSelectionChangeActiveProperty.GetValue (this, null);
if (!changeActive)
IsSelectionChangeActiveProperty.SetValue (this, true, null);
Expand Down Expand Up @@ -264,7 +309,7 @@ private void SelectedItemsCollectionChanged (object sender, NotifyCollectionChan
break;
}

OnSelectedItemsChanged (EventArgs.Empty);
EndDeferSelectionChanged();

if (!changeActive)
IsSelectionChangeActiveProperty.SetValue (this, changeActive, null);
Expand Down Expand Up @@ -317,6 +362,7 @@ public void SelectItem(ExTreeViewItem item)
if (item == null)
return;

BeginDeferSelectionChanged();
FocusItem(item);
if (!CtrlPressed)
SelectedItems.Clear();
Expand Down Expand Up @@ -344,6 +390,7 @@ public void SelectItem(ExTreeViewItem item)
else
SelectedItems.Add(item.DataContext);
}
EndDeferSelectionChanged();
}

private IEnumerable<ExTreeViewItem> GetAllVisibleItems(ItemsControl itemsControl)
Expand Down