aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Views
diff options
context:
space:
mode:
authorRoy Ben-Shabat <Roy@Twine-s.com>2019-10-28 13:55:52 +0200
committerRoy Ben-Shabat <Roy@Twine-s.com>2019-10-28 13:55:52 +0200
commit521326ce426ed0cd5b8d92b280cdf0c7213e7b50 (patch)
tree3c3f8e7f1490a6d848ed307ee108c04fad80fa0a /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Views
parenta43d087e6d77333cd6f40642acb731519697998e (diff)
parentabc09fbcd0a9c0883b957378d71679be776b6f56 (diff)
downloadTango-521326ce426ed0cd5b8d92b280cdf0c7213e7b50.tar.gz
Tango-521326ce426ed0cd5b8d92b280cdf0c7213e7b50.zip
Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Views')
-rw-r--r--Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Views/ComparisonWizardView.xaml6
1 files changed, 3 insertions, 3 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Views/ComparisonWizardView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Views/ComparisonWizardView.xaml
index d8a125e02..19980b4dc 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Views/ComparisonWizardView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Views/ComparisonWizardView.xaml
@@ -14,7 +14,7 @@
<converters:BooleanToVisibilityInverseConverter x:Key="BooleanToVisibilityInverseConverter" />
<Style TargetType="TextBlock" x:Key="DifferenceTextBoxStyle">
<Style.Triggers>
- <DataTrigger Binding="{Binding IsDifferent}" Value="True" >
+ <DataTrigger Binding="{Binding HasDifferences}" Value="True" >
<Setter Property="Foreground" Value="{StaticResource RedBrush100}"/>
</DataTrigger>
</Style.Triggers>
@@ -100,7 +100,7 @@
<MultiDataTrigger>
<MultiDataTrigger.Conditions>
<Condition Binding="{Binding ElementName=cbShowOnlyDifference, Path=IsChecked}" Value="True" />
- <Condition Binding="{Binding IsDifferent}" Value="False" />
+ <Condition Binding="{Binding HasDifferences}" Value="False" />
</MultiDataTrigger.Conditions>
<MultiDataTrigger.Setters>
<Setter Property="Visibility" Value="Collapsed" />
@@ -197,7 +197,7 @@
<MultiDataTrigger>
<MultiDataTrigger.Conditions>
<Condition Binding="{Binding ElementName=cbShowOnlyDifference, Path=IsChecked}" Value="True" />
- <Condition Binding="{Binding IsDifferent}" Value="False" />
+ <Condition Binding="{Binding HasDifferences}" Value="False" />
</MultiDataTrigger.Conditions>
<MultiDataTrigger.Setters>
<Setter Property="Visibility" Value="Collapsed" />