diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2020-07-23 18:54:57 +0300 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2020-07-23 18:54:57 +0300 |
| commit | 5c5cb4094035c88e0e8f3a403d29c6bc16b52bb5 (patch) | |
| tree | a20476d7c33604717c2beb519b00d50434145215 /Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common | |
| parent | cf49f9b7af8cb4ad0376157d27ef208eca6d1304 (diff) | |
| parent | 3dfe3c3923411953cf0568c925d6d778b61b2db7 (diff) | |
| download | Tango-5c5cb4094035c88e0e8f3a403d29c6bc16b52bb5.tar.gz Tango-5c5cb4094035c88e0e8f3a403d29c6bc16b52bb5.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_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"/> |