Simplify member access (Fluent)
MODIFY
WalletWasabi.Fluent/Controls/NavBarListBox.cs
WalletWasabi.Fluent/Controls/NavBarListBox.cs
@@ -13,8 +13,8 @@ namespace WalletWasabi.Fluent.Controls
{
return new ItemContainerGenerator<NavBarItem>(
this,
- ListBoxItem.ContentProperty,
- ListBoxItem.ContentTemplateProperty);
+ ContentControl.ContentProperty,
+ ContentControl.ContentTemplateProperty);
}
}
}

MODIFY
WalletWasabi.Fluent/Controls/NavBarTreeItem.xaml.cs
WalletWasabi.Fluent/Controls/NavBarTreeItem.xaml.cs
@@ -22,10 +22,10 @@ namespace WalletWasabi.Fluent.Controls
{
return new TreeItemContainerGenerator<NavBarTreeItem>(
this,
- TreeViewItem.HeaderProperty,
- TreeViewItem.ItemTemplateProperty,
- TreeViewItem.ItemsProperty,
- TreeViewItem.IsExpandedProperty);
+ HeaderProperty,
+ ItemTemplateProperty,
+ ItemsProperty,
+ IsExpandedProperty);
}
}
}

MODIFY
WalletWasabi.Fluent/Controls/NavBarTreeView.cs
WalletWasabi.Fluent/Controls/NavBarTreeView.cs
using Avalonia.Controls;
using Avalonia.Controls.Generators;
+using Avalonia.Controls.Primitives;
using Avalonia.Styling;
using System;
@@ -13,9 +14,9 @@ namespace WalletWasabi.Fluent.Controls
{
return new TreeItemContainerGenerator<NavBarTreeItem>(
this,
- TreeViewItem.HeaderProperty,
- TreeViewItem.ItemTemplateProperty,
- TreeViewItem.ItemsProperty,
+ HeaderedItemsControl.HeaderProperty,
+ ItemTemplateProperty,
+ ItemsProperty,
TreeViewItem.IsExpandedProperty);
}
}

MODIFY
WalletWasabi.Fluent/ViewModels/Dialogs/TestDialogViewModel.cs
WalletWasabi.Fluent/ViewModels/Dialogs/TestDialogViewModel.cs
@@ -34,7 +34,7 @@ namespace WalletWasabi.Fluent.ViewModels.Dialogs
public void Close()
{
// TODO: Dialog.xaml back Button binding to Close() method on base class which is protected so exception is thrown.
- base.Close(false);
+ Close(false);
}
}
}
\ No newline at end of file

Simplify member access (Fluent)