Fix "padding" issues for outlined style by letting the padding animat…

…e from 0 to desired size

MaterialDesignThemes.Wpf/SmartHint.cs

@@ -166,6 +166,15 @@ public VerticalAlignment FloatingAlignment
         set => SetValue(FloatingAlignmentProperty, value);
     }
 
+    public static readonly DependencyProperty FloatingMarginProperty = DependencyProperty.Register(
+        nameof(FloatingMargin), typeof(Thickness), typeof(SmartHint), new PropertyMetadata(default(Thickness)));
+
+    public Thickness FloatingMargin
+    {
+        get => (Thickness) GetValue(FloatingMarginProperty);
+        set => SetValue(FloatingMarginProperty, value);
+    }
+
     static SmartHint()
     {
         DefaultStyleKeyProperty.OverrideMetadata(typeof(SmartHint), new FrameworkPropertyMetadata(typeof(SmartHint)));
@@ -339,3 +348,28 @@ public class FloatingHintScaleTransformConverter : IMultiValueConverter
     public object[]? ConvertBack(object? value, Type[] targetTypes, object? parameter, CultureInfo culture)
         => throw new NotImplementedException();
 }
+
+public class FloatingHintMarginConverter : IMultiValueConverter
+{
+    public object? Convert(object?[]? values, Type targetType, object? parameter, CultureInfo culture)
+    {
+        if (values?.Length != 2
+            || values.Any(v => v == null)
+            || !double.TryParse(values[0]!.ToString(), out double scale)
+            || values[1] is not Thickness floatingMargin)
+        {
+            return Transform.Identity;
+        }
+
+        return floatingMargin with
+        {
+            Left = floatingMargin.Left * scale,
+            Top = floatingMargin.Top * scale,
+            Right = floatingMargin.Right * scale,
+            Bottom = floatingMargin.Bottom * scale,
+        };
+    }
+
+    public object[]? ConvertBack(object? value, Type[] targetTypes, object? parameter, CultureInfo culture)
+        => throw new NotImplementedException();
+}

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.SmartHint.xaml

@@ -14,6 +14,7 @@
       <CubicEase x:Key="AnimationEasingFunction" EasingMode="EaseInOut" />
       <wpf:FloatingHintTranslateTransformConverter x:Key="FloatingHintTranslateTransformConverter" />
       <wpf:FloatingHintScaleTransformConverter x:Key="FloatingHintScaleTransformConverter" />
+      <wpf:FloatingHintMarginConverter x:Key="FloatingHintMarginConverter" />
       <converters:FloatingHintTextBlockMarginConverter x:Key="FloatingHintTextBlockMarginConverter" />
     </Style.Resources>
     <Setter Property="HorizontalAlignment" Value="Stretch" />
@@ -95,24 +96,24 @@
                                            Storyboard.TargetName="FloatingHintTextBlock"
                                            Storyboard.TargetProperty="Opacity"
                                            To="{TemplateBinding HintOpacity}"
-                                           Duration="0:0:1.15" />
+                                           Duration="0:0:0.15" />
                           <DoubleAnimation EasingFunction="{StaticResource AnimationEasingFunction}"
                                            Storyboard.TargetName="ScaleHost"
                                            Storyboard.TargetProperty="Scale"
                                            To="1"
-                                           Duration="0:0:1.15" />
+                                           Duration="0:0:0.15" />
                         </Storyboard>
                       </VisualTransition>
                       <VisualTransition From="*" To="HintRestingPosition">
                         <Storyboard>
                           <DoubleAnimation EasingFunction="{StaticResource AnimationEasingFunction}"
                                            Storyboard.TargetName="FloatingHintTextBlock"
                                            Storyboard.TargetProperty="Opacity"
-                                           Duration="0:0:1.15" />
+                                           Duration="0:0:0.15" />
                           <DoubleAnimation EasingFunction="{StaticResource AnimationEasingFunction}"
                                            Storyboard.TargetName="ScaleHost"
                                            Storyboard.TargetProperty="Scale"
-                                           Duration="0:0:1.15" />
+                                           Duration="0:0:0.15" />
                         </Storyboard>
                       </VisualTransition>
                     </VisualStateGroup.Transitions>
@@ -159,14 +160,14 @@
                     <ContentControl x:Name="FloatingHintTextBlock"
                                     HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                     VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                    Content="{TemplateBinding Hint}"
                                     FontFamily="{TemplateBinding FontFamily}"
                                     FontSize="{TemplateBinding FontSize}"
                                     IsHitTestVisible="False"
                                     IsTabStop="False"
                                     Opacity="{TemplateBinding HintOpacity}"
                                     RenderTransformOrigin="0,0"
                                     Visibility="{TemplateBinding UseFloating, Converter={StaticResource BoolToVisConverter}}">
+
                       <ContentControl.Margin>
                         <MultiBinding Converter="{StaticResource FloatingHintTextBlockMarginConverter}">
                           <Binding Path="(wpf:HintAssist.HintHorizontalAlignment)" RelativeSource="{RelativeSource TemplatedParent}" />
@@ -189,6 +190,16 @@
                           <Binding Source="{StaticResource NoContentFloatingScale}" />
                         </MultiBinding>
                       </ContentControl.RenderTransform>
+                      <Grid Background="{TemplateBinding wpf:HintAssist.Background}" IsHitTestVisible="False">
+                        <ContentControl Content="{TemplateBinding Hint}" IsHitTestVisible="False" IsTabStop="False">
+                          <ContentControl.Margin>
+                            <MultiBinding Converter="{StaticResource FloatingHintMarginConverter}">
+                              <Binding ElementName="ScaleHost" Path="Scale" />
+                              <Binding Path="FloatingMargin" RelativeSource="{RelativeSource TemplatedParent}" />
+                            </MultiBinding>
+                          </ContentControl.Margin>
+                        </ContentControl>
+                      </Grid>
                     </ContentControl>
                   </Canvas>
                 </Grid>

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TextBox.xaml

@@ -194,7 +194,8 @@
                                  HintOpacity="{TemplateBinding wpf:HintAssist.HintOpacity}"
                                  HintProxy="{Binding RelativeSource={RelativeSource TemplatedParent}, Converter={x:Static converters:HintProxyFabricConverter.Instance}}"
                                  UseFloating="{TemplateBinding wpf:HintAssist.IsFloating}"
-                                 FloatingTarget="{Binding ElementName=PART_ContentHost}">
+                                 FloatingTarget="{Binding ElementName=PART_ContentHost}"
+                                 wpf:HintAssist.Background="{TemplateBinding wpf:HintAssist.Background}">
                     <wpf:SmartHint.Hint>
                       <Border x:Name="HintBackgroundBorder"
                               Background="{TemplateBinding wpf:HintAssist.Background}"
@@ -327,6 +328,7 @@
               <Setter TargetName="Underline" Property="Visibility" Value="Collapsed" />
               <Setter TargetName="Hint" Property="FloatingTarget" Value="{Binding ElementName=OuterBorder}" />
               <Setter TargetName="Hint" Property="FloatingAlignment" Value="Center" />
+              <Setter TargetName="Hint" Property="FloatingMargin" Value="4,0" />
               <Setter TargetName="Hint" Property="InitialVerticalOffset" Value="{Binding ElementName=Hint, Path=ActualHeight, Converter={StaticResource DivisionConverter}, ConverterParameter=2}" />
             </Trigger>
             <MultiTrigger>
@@ -336,8 +338,6 @@
                 <Condition SourceName="Hint" Property="IsHintInFloatingPosition" Value="True" />
               </MultiTrigger.Conditions>
               <Setter Property="wpf:HintAssist.Background" Value="{DynamicResource MaterialDesign.Brush.Background}" />
-              <Setter TargetName="HintBackgroundBorder" Property="Padding" Value="4,0" />
-              <Setter TargetName="Hint" Property="InitialHorizontalOffset" Value="-4" />
             </MultiTrigger>
 
             <!-- IsEnabled -->