aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Views
diff options
context:
space:
mode:
authorShlomo Hecht <shlomo@twine-s.com>2019-10-24 17:08:45 +0300
committerShlomo Hecht <shlomo@twine-s.com>2019-10-24 17:08:45 +0300
commitb63e2f557d781fa3cfcf8e6b9c784641c0c8927f (patch)
tree687c2d25f1a06f0f8a20d44a365eac33355c20f3 /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Views
parent87e24883ea2c5f1947943547cff29357bc8cbd2f (diff)
parent50ed121723c0dad1ce5d1af7f2a12a56ae2ba8a7 (diff)
downloadTango-b63e2f557d781fa3cfcf8e6b9c784641c0c8927f.tar.gz
Tango-b63e2f557d781fa3cfcf8e6b9c784641c0c8927f.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" />