diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2020-07-27 15:39:26 +0300 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2020-07-27 15:39:26 +0300 |
| commit | 5e59906df60d82248da4ae47677ed59d56fb605a (patch) | |
| tree | 8585548197bfada234b7ded17028aba9563c32de /Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common | |
| parent | 3210901f7aa313cfe1eb2c303b539d6e7d1f2324 (diff) | |
| parent | c947fa4b4999b1368ee500c3349ef6e8fce3f0b5 (diff) | |
| download | Tango-5e59906df60d82248da4ae47677ed59d56fb605a.tar.gz Tango-5e59906df60d82248da4ae47677ed59d56fb605a.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common')
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Resources/MaterialDesign.xaml | 6 |
1 files changed, 3 insertions, 3 deletions
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"/> |