aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Views
diff options
context:
space:
mode:
authorShai Frieder <Shai.Frieder@twine-s.com>2019-10-10 15:01:54 +0300
committerShai Frieder <Shai.Frieder@twine-s.com>2019-10-10 15:01:54 +0300
commit387e6e639028839dfeee9fe4b08259ecc8633b6b (patch)
treeba6362537dc1cadf17262a2d227ad92f3283e79e /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Views
parentb30b9e33bc8a7df92b37df790ff3cd97d9f76a55 (diff)
parent28e3d07434e6deb0824b4c929c910500ea7deb38 (diff)
downloadTango-387e6e639028839dfeee9fe4b08259ecc8633b6b.tar.gz
Tango-387e6e639028839dfeee9fe4b08259ecc8633b6b.zip
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_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" />