From 7c429939d3857ac22e5dccb6757bae679a017ed9 Mon Sep 17 00:00:00 2001
From: Victoria Plitt <Victoria.Plitt@twine-s.com>
Date: Thu, 23 Jul 2020 16:36:59 +0300
Subject: Added combobox style to some items

Related Work Items: #3099
---
 .../Tango.MachineStudio.Common/Resources/MaterialDesign.xaml        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common')

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Resources/MaterialDesign.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Resources/MaterialDesign.xaml
index 11dc2bad3..222eecb71 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Resources/MaterialDesign.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Resources/MaterialDesign.xaml
@@ -556,7 +556,7 @@
                         <Border Grid.Row="0"
                         CornerRadius="2 2 0 0"
                         Background="{DynamicResource ComboBox.Floating.Background}"
-                        Height="0"/>
+                        Height="{StaticResource PopupTopBottomMargin}"/>
 
                         <Grid Grid.Row="1">
                             <Grid.ColumnDefinitions>
@@ -575,7 +575,7 @@
 
                         <ContentPresenter Grid.Row="3"/>
 
-                        <Border Grid.Row="4" CornerRadius="0 0 2 2" Height="0" Background="{DynamicResource ComboBox.Floating.Background}" />
+                        <Border Grid.Row="4" CornerRadius="0 0 2 2" Height="{StaticResource PopupTopBottomMargin}" Background="{DynamicResource ComboBox.Floating.Background}" />
                     </Grid>
                 </Grid>
             </ControlTemplate>
@@ -675,7 +675,7 @@
                                     <Setter Property="ItemContainerStyle" Value="{StaticResource MaterialDesignComboBoxItemStyle}" />
                                 </Trigger>
                                 <Trigger SourceName="PART_Popup" Property="IsOpen" Value="True">
-                                    <Setter Property="Background" TargetName="templateRoot" Value="{DynamicResource ComboBox.Floating.Background}" />
+                                    <Setter Property="Background" TargetName="templateRoot" Value="Transparent" />
                                 </Trigger>
                                 <Trigger Property="IsEnabled" Value="False">
                                     <Setter TargetName="templateRoot" Property="Opacity" Value="0.56"/>
-- 
cgit v1.3.1