Improve filtering
This commit is contained in:
@@ -351,7 +351,7 @@ public partial class ObservableCollection<TItem> :
|
||||
Disposer.Dispose(this);
|
||||
}
|
||||
|
||||
public void Activate(Func<ActivationBuilder> aggregateDelegate,
|
||||
public void Activate(Func<ActivationBuilder> activateDelegate,
|
||||
bool reset = false)
|
||||
{
|
||||
if (reset)
|
||||
@@ -359,8 +359,8 @@ public partial class ObservableCollection<TItem> :
|
||||
Clear();
|
||||
}
|
||||
|
||||
ActivationBuilder expression = aggregateDelegate.Invoke();
|
||||
Publisher.Publish(expression.Value, expression.Key);
|
||||
ActivationBuilder builder = activateDelegate.Invoke();
|
||||
Publisher.Publish(builder.Value, builder.Key);
|
||||
}
|
||||
|
||||
public IEnumerator<TItem> GetEnumerator() =>
|
||||
|
||||
@@ -10,8 +10,6 @@ public class InvokeNavigationViewItemAction :
|
||||
AvaloniaObject,
|
||||
IAction
|
||||
{
|
||||
private int currentIndex;
|
||||
|
||||
public static readonly StyledProperty<int> SelectedIndexProperty =
|
||||
AvaloniaProperty.Register<InvokeNavigationViewItemAction, int>(nameof(SelectedIndex), 0);
|
||||
|
||||
@@ -32,11 +30,6 @@ public class InvokeNavigationViewItemAction :
|
||||
|
||||
public object? Execute(object? sender, object? parameter)
|
||||
{
|
||||
//if (SelectedIndex == currentIndex)
|
||||
//{
|
||||
// return false;
|
||||
//}
|
||||
|
||||
if ((Target ?? sender) is NavigationViewItem navigationViewItem)
|
||||
{
|
||||
Dispatcher.UIThread.Post(() =>
|
||||
@@ -60,7 +53,6 @@ public class InvokeNavigationViewItemAction :
|
||||
if (collection is { Count: > 0 })
|
||||
{
|
||||
navigationView.SetValue(NavigationView.SelectedItemProperty, collection[SelectedIndex]);
|
||||
currentIndex = SelectedIndex;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user