From 8bd342431df217349074a2c43f1dd150807ab0a1 Mon Sep 17 00:00:00 2001
From: Victoria Plitt <Victoria.Plitt@twine-s.com>
Date: Sun, 12 Jul 2020 12:43:15 +0300
Subject: MS Popup of Combobox.  Selected part of Combobox was showed wrong.
 item 3099

---
 .../Resources/MaterialDesign.xaml                  | 41 +++++++---------------
 1 file changed, 13 insertions(+), 28 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 37e35b1ab..11dc2bad3 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Resources/MaterialDesign.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Resources/MaterialDesign.xaml
@@ -540,16 +540,12 @@
                     <Grid.RowDefinitions>
                         <RowDefinition Height="*" />
                     </Grid.RowDefinitions>
-                    <Border Background="Transparent"
-                    BorderBrush="{DynamicResource MaterialDesignShadowBrush}"
-                    BorderThickness="1"
-                    CornerRadius="2">
+                    <Border Background="Transparent" BorderBrush="{DynamicResource MaterialDesignShadowBrush}" BorderThickness="1" CornerRadius="2">
                         <Border.Effect>
                             <BlurEffect Radius="6"/>
                         </Border.Effect>
                     </Border>
-                    <Grid Margin="1"
-                  SnapsToDevicePixels="True">
+                    <Grid Margin="1" SnapsToDevicePixels="True">
                         <Grid.RowDefinitions>
                             <RowDefinition Height="Auto"/>
                             <RowDefinition Height="Auto"/>
@@ -560,7 +556,7 @@
                         <Border Grid.Row="0"
                         CornerRadius="2 2 0 0"
                         Background="{DynamicResource ComboBox.Floating.Background}"
-                        Height="{StaticResource PopupTopBottomMargin}"/>
+                        Height="0"/>
 
                         <Grid Grid.Row="1">
                             <Grid.ColumnDefinitions>
@@ -568,29 +564,18 @@
                                 <ColumnDefinition Width="Auto"/>
                                 <ColumnDefinition Width="*"/>
                             </Grid.ColumnDefinitions>
-                            <Border Grid.Column="0"
-                            Width="{StaticResource PopupLeftRightMargin}"
-                            Background="{DynamicResource ComboBox.Floating.Background}"
-                               />
-                            <Grid Grid.Column="1"
-                          Width="{Binding RelativeSource={RelativeSource AncestorType={x:Type materialDesign:ComboBoxPopup}}, Path=VisiblePlacementWidth}"
-                          Height="{Binding ElementName=templateRoot, Path=ActualHeight}"/>
-                            <Border Grid.Column="2"
-                            MinWidth="{StaticResource PopupLeftRightMargin}"
-                            Background="{DynamicResource ComboBox.Floating.Background}"
-                               />
+                            <Border Grid.Column="0" Width="{StaticResource PopupLeftRightMargin}" Background="{DynamicResource ComboBox.Floating.Background}" />
+                            <Grid Grid.Column="1" 
+                                    Width="{Binding RelativeSource={RelativeSource AncestorType={x:Type materialDesign:ComboBoxPopup}}, Path=VisiblePlacementWidth}"
+                                    Height="0"/>
+                            <Border Grid.Column="2"  MinWidth="{StaticResource PopupLeftRightMargin}" Background="{DynamicResource ComboBox.Floating.Background}"/>
                         </Grid>
 
-                        <Border Grid.Row="2"
-                        Background="{DynamicResource ComboBox.Floating.Background}"
-                        Height="{StaticResource PopupContentPresenterExtend}"/>
+                        <Border Grid.Row="2"  Background="{DynamicResource ComboBox.Floating.Background}" Height="0"/>
 
                         <ContentPresenter Grid.Row="3"/>
 
-                        <Border Grid.Row="4"
-                        CornerRadius="0 0 2 2"
-                        Height="{StaticResource PopupTopBottomMargin}"
-                        Background="{DynamicResource ComboBox.Floating.Background}" />
+                        <Border Grid.Row="4" CornerRadius="0 0 2 2" Height="0" Background="{DynamicResource ComboBox.Floating.Background}" />
                     </Grid>
                 </Grid>
             </ControlTemplate>
@@ -657,7 +642,7 @@
                                Visibility="{Binding Path=(materialDesign:TextFieldAssist.DecorationVisibility), RelativeSource={RelativeSource TemplatedParent}}"/>
 
                                     <materialDesign:ComboBoxPopup x:Name="PART_Popup"
-                                   
+                                  
                                    AllowsTransparency="true"
                                    Focusable="False"
                                    HorizontalOffset="-11.5"
@@ -667,9 +652,9 @@
                                    UseLayoutRounding="True"
                                    Placement="Custom"
                                    PopupAnimation="Fade"
-                                   VerticalOffset="0"
+                                   VerticalOffset="-10"
                                    DefaultVerticalOffset="5"
-                                   DownVerticalOffset="-15.5"
+                                   DownVerticalOffset="{Binding ElementName=templateRoot, Path=ActualHeight}"
                                    UpVerticalOffset="15"
                                    ClassicMode="{Binding Path=(materialDesign:ComboBoxAssist.ClassicMode), RelativeSource={RelativeSource TemplatedParent}}"
                                    UpContentTemplate="{StaticResource PopupContentUpTemplate}"
-- 
cgit v1.3.1