ComboBox without overlay

Author: l1pton17

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ComboBox.xaml

@@ -12,38 +12,6 @@
     <converters:MathConverter x:Key="MathAddConverter" Operation="Add" />
     <converters:BrushRoundConverter x:Key="BrushRoundConverter" />
 
-    <Storyboard x:Key="MaterialDesignComboBoxPopupAnimationExpand">
-        <!--
-        <ThicknessAnimation AccelerationRatio="0.7"
-                            DecelerationRatio="0.3"
-                            Duration="0:0:0.3"
-                            From="16 0 16 0"
-                            Storyboard.TargetName="shadow"
-                            Storyboard.TargetProperty="Margin"
-                            To="0 0 0 0" />
-        <DoubleAnimation AccelerationRatio="0.7"
-                         DecelerationRatio="0.3"
-                         Duration="0:0:0.4"
-                         From="0"
-                         Storyboard.TargetName="PopupTemplateRootGrid"
-                         Storyboard.TargetProperty="Opacity"
-                         To="1" />
-        -->
-    </Storyboard>
-
-    <Storyboard x:Key="MaterialDesignComboBoxPopupAnimationCollapse">
-        <!--
-        <DoubleAnimation Duration="0:0:0"
-                         Storyboard.TargetName="PopupTemplateRootGrid"
-                         Storyboard.TargetProperty="Opacity"
-                         To="0" />
-        <ThicknessAnimation Duration="0:0:0.3"
-                            Storyboard.TargetName="shadow"
-                            Storyboard.TargetProperty="Margin"
-                            To="11 0 11 0" />
-        -->
-    </Storyboard>
-
     <Style x:Key="FocusVisual">
         <Setter Property="Control.Template">
             <Setter.Value>
@@ -334,11 +302,10 @@
                     <Border x:Name="shadow"
                             Background="Transparent"
                             BorderBrush="{DynamicResource MaterialDesignShadowBrush}"
-                            Opacity="0.72"
                             BorderThickness="1"
                             CornerRadius="2">
                         <Border.Effect>
-                            <BlurEffect Radius="3"/>
+                            <BlurEffect Radius="6"/>
                         </Border.Effect>
                     </Border>
                     <Grid Margin="1">
@@ -400,14 +367,6 @@
                 <Setter TargetName="Underline" Property="Visibility" Value="Hidden"/>
                 <Setter TargetName="toggleButton" Property="Visibility" Value="Hidden"/>
             </MultiTrigger>
-            <Trigger Property="IsDropDownOpen" Value="True">
-                <Trigger.EnterActions>
-                    <BeginStoryboard Storyboard="{DynamicResource MaterialDesignComboBoxPopupAnimationExpand}" />
-                </Trigger.EnterActions>
-                <Trigger.ExitActions>
-                    <BeginStoryboard Storyboard="{DynamicResource MaterialDesignComboBoxPopupAnimationCollapse}" />
-                </Trigger.ExitActions>
-            </Trigger>
             <Trigger SourceName="PART_Popup" Property="HasDropShadow" Value="true">
                 <Setter TargetName="shadow" Property="Margin" Value="0" />
             </Trigger>
@@ -532,7 +491,7 @@
                        UseLayoutRounding="True"
                        Placement="RelativePoint"
                        PopupAnimation="Fade"
-                       VerticalOffset="-21">
+                       VerticalOffset="-9">
                     <Grid MinWidth="{Binding ActualWidth, ElementName=templateRoot, Converter={StaticResource MathAddConverter}, ConverterParameter=32}"
                           MaxHeight="{TemplateBinding MaxDropDownHeight}"
                           Margin="6">
@@ -542,11 +501,10 @@
                         <Border x:Name="shadow"
                                 Background="Transparent"
                                 BorderBrush="{DynamicResource MaterialDesignShadowBrush}"
-                                Opacity="0.72"
                                 BorderThickness="1"
                                 CornerRadius="2">
                             <Border.Effect>
-                                <BlurEffect Radius="3"/>
+                                <BlurEffect Radius="6" />
                             </Border.Effect>
                         </Border>
                         <Grid Margin="1">
@@ -559,7 +517,7 @@
                             </Grid.RowDefinitions>
                             <Rectangle Grid.Row="0"
                                        Fill="{DynamicResource MaterialDesignPaper}"
-                                       Height="20"/>
+                                       Height="8"/>
 
                             <Grid Grid.Row="1">
                                 <Grid.ColumnDefinitions>
@@ -597,10 +555,6 @@
         </Grid>
         <ControlTemplate.Triggers>
             <Trigger Property="wpf:TextFieldAssist.IsNullOrEmpty" Value="False">
-                <!--
-                <Setter TargetName="GridContentCloneWrapper" Property="Margin" Value="16 4 16 4" />
-                <Setter TargetName="PART_Popup" Property="VerticalOffset" Value="-20" />
-                -->
                 <Trigger.EnterActions>
                     <BeginStoryboard x:Name="MoveHintAsideStoryboard_BeginStoryboard" Storyboard="{StaticResource MoveHintAsideStoryboard}" />
                 </Trigger.EnterActions>
@@ -610,15 +564,18 @@
             </Trigger>
 
             <Trigger Property="IsEditable" Value="True">
-                <!--
-                <Setter TargetName="GridContentCloneWrapper" Property="Margin" Value="16 4 16 4" />
-                <Setter TargetName="PART_Popup" Property="VerticalOffset" Value="-20" />
-                -->
-
                 <Setter TargetName="PART_EditableTextBox" Property="Visibility" Value="Visible" />
                 <Setter TargetName="Underline" Property="Visibility" Value="Visible" />
                 <Setter TargetName="contentPresenter" Property="Visibility" Value="Collapsed" />
             </Trigger>
+            <MultiTrigger>
+                <MultiTrigger.Conditions>
+                    <Condition Property="IsEditable" Value="False"/>
+                    <Condition Property="IsDropDownOpen" Value="True"/>
+                </MultiTrigger.Conditions>
+                <Setter TargetName="Underline" Property="Visibility" Value="Hidden"/>
+                <Setter TargetName="toggleButton" Property="Visibility" Value="Hidden"/>
+            </MultiTrigger>
             <MultiTrigger>
                 <MultiTrigger.Conditions>
                     <Condition Property="wpf:TextFieldAssist.IsNullOrEmpty" Value="False" />
@@ -654,7 +611,6 @@
     </ControlTemplate>
 
     <Style x:Key="MaterialDesignComboBox" TargetType="{x:Type ComboBox}">
-        <Setter Property="wpf:ComboBoxAssist.ManagedOverlay" Value="True"/>
         <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
         <Setter Property="Background" Value="Transparent"/>
         <Setter Property="BorderBrush" Value="{DynamicResource MaterialDesignTextBoxBorder}"/>
@@ -664,10 +620,10 @@
         <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
         <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
         <Setter Property="Padding" Value="0 4 0 4" />
-        <Setter Property="VerticalContentAlignment" Value="Bottom" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
         <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
         <Setter Property="HorizontalAlignment" Value="Left"/>
-        <Setter Property="VerticalAlignment" Value="Bottom"/>
+        <Setter Property="VerticalAlignment" Value="Center"/>
         <Setter Property="ScrollViewer.CanContentScroll" Value="true" />
         <Setter Property="ScrollViewer.PanningMode" Value="Both" />
         <Setter Property="UseLayoutRounding" Value="False"/>