mikx
/
Filtration
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed #28 - Add appearance block item links firing wrong command

This commit is contained in:
Ben Wallis 2016-08-30 22:53:17 +01:00
parent 85f47ce654
commit 80b8318574
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Filtration.ObjectModel/BlockItemTypes/RarityBlockItem.cs
View File

@ -15,7 +15,12 @@ namespace Filtration.ObjectModel.BlockItemTypes
: base(predicateOperator, predicateOperand) : base(predicateOperator, predicateOperand)
{ {
} }
public RarityBlockItem(FilterPredicateOperator predicateOperator, ItemRarity predicateOperand)
: base(predicateOperator, (int)predicateOperand)
{
}
public override string PrefixText => "Rarity"; public override string PrefixText => "Rarity";
public override string OutputText => PrefixText + " " + FilterPredicate.PredicateOperator public override string OutputText => PrefixText + " " + FilterPredicate.PredicateOperator
.GetAttributeDescription() + " " + ((ItemRarity) FilterPredicate.PredicateOperand).GetAttributeDescription(); .GetAttributeDescription() + " " + ((ItemRarity) FilterPredicate.PredicateOperand).GetAttributeDescription();

2
Filtration/Views/ItemFilterBlockView.xaml
View File

@ -264,7 +264,7 @@
<ItemsControl.ItemTemplate> <ItemsControl.ItemTemplate>
<DataTemplate> <DataTemplate>
<TextBlock Margin="0,0,3,0"> <TextBlock Margin="0,0,3,0">
<Hyperlink Command="{Binding ElementName=TopLevelGrid, Path=DataContext.AddBlockCommand}" CommandParameter="{Binding}"> <Hyperlink Command="{Binding ElementName=TopLevelGrid, Path=DataContext.AddFilterBlockItemCommand}" CommandParameter="{Binding}">
<TextBlock>+</TextBlock><TextBlock Text="{Binding Path=., Converter={StaticResource BlockItemTypeToStringConverter}}" /> <TextBlock>+</TextBlock><TextBlock Text="{Binding Path=., Converter={StaticResource BlockItemTypeToStringConverter}}" />
</Hyperlink> </Hyperlink>
</TextBlock> </TextBlock>