Skip to content

Commit 2d0d432

Browse files
committed
Fix HasFlagConverter
'|' stand for "and". It can create confused >.<
1 parent dfd6284 commit 2d0d432

File tree

3 files changed

+24
-3
lines changed

3 files changed

+24
-3
lines changed

Grabacr07.KanColleViewer/Views/Contents/Fleets.xaml

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -479,7 +479,19 @@
479479
Property="Visibility"
480480
Value="Visible" />
481481
</DataTrigger>
482-
<DataTrigger Binding="{Binding Ship.Situation, Converter={StaticResource HasFlagConverter}, ConverterParameter=Tow|Evacuation}"
482+
<DataTrigger Binding="{Binding Ship.Situation, Converter={StaticResource HasFlagConverter}, ConverterParameter=Evacuation}"
483+
Value="True">
484+
<Setter TargetName="HPText"
485+
Property="Opacity"
486+
Value=".2" />
487+
<Setter TargetName="HPIndicator"
488+
Property="Opacity"
489+
Value=".2" />
490+
<Setter TargetName="EvacuationIndicator"
491+
Property="Visibility"
492+
Value="Visible" />
493+
</DataTrigger>
494+
<DataTrigger Binding="{Binding Ship.Situation, Converter={StaticResource HasFlagConverter}, ConverterParameter=Tow}"
483495
Value="True">
484496
<Setter TargetName="HPText"
485497
Property="Opacity"

Grabacr07.KanColleViewer/Views/Contents/Overview.xaml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,16 @@
273273
Property="Visibility"
274274
Value="Visible" />
275275
</DataTrigger>
276-
<DataTrigger Binding="{Binding Ship.Situation, Converter={StaticResource HasFlagConverter}, ConverterParameter=Tow|Evacuation}"
276+
<DataTrigger Binding="{Binding Ship.Situation, Converter={StaticResource HasFlagConverter}, ConverterParameter=Evacuation}"
277+
Value="True">
278+
<Setter TargetName="HPIndicator"
279+
Property="Opacity"
280+
Value=".2" />
281+
<Setter TargetName="EvacuationIndicator"
282+
Property="Visibility"
283+
Value="Visible" />
284+
</DataTrigger>
285+
<DataTrigger Binding="{Binding Ship.Situation, Converter={StaticResource HasFlagConverter}, ConverterParameter=Tow}"
277286
Value="True">
278287
<Setter TargetName="HPIndicator"
279288
Property="Opacity"

Grabacr07.KanColleViewer/Views/Converters/HasFlagConverter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
2323
return p.Split(new[] { '|' }, StringSplitOptions.RemoveEmptyEntries)
2424
.Select(x => x.Trim())
2525
.Select(x => Enum.Parse(enumValue.GetType(), x) as Enum)
26-
.Any(x => enumValue.HasFlag(x));
26+
.All(x => enumValue.HasFlag(x));
2727
}
2828
}
2929
}

0 commit comments

Comments
 (0)