Only consider hover/focus when style is outlined

Author: nicolaihenriksen

src/MaterialDesignThemes.Wpf/Converters/TextBoxHorizontalScrollBarMarginConverter.cs

@@ -13,19 +13,25 @@ public class TextBoxHorizontalScrollBarMarginConverter : IMultiValueConverter
             double prefixTextWidth,
             Thickness prefixTextMargin,
             bool isMouseOver,
-            bool hasKeyboardFocus])
+            bool hasKeyboardFocus,
+            bool isOutlinedStyle,
+            Thickness normalBorder,
+            Thickness activeBorder])
         {
             double iconMargin = leadingIconWidth > 0 ? leadingIconMargin.Left + leadingIconMargin.Right : 0;
             double prefixMargin = prefixTextWidth > 0 ? prefixTextMargin.Left + prefixTextMargin.Right : 0;
             double offset = leadingIconWidth + iconMargin + prefixTextWidth + prefixMargin;
             double bottomOffset = 0;
             double topOffset = 0;
 
-            if (isMouseOver || hasKeyboardFocus)
+            if (isOutlinedStyle && (isMouseOver || hasKeyboardFocus))
             {
-                offset -= 1;
-                topOffset += 1;
-                bottomOffset -= 1;
+                double horizDelta = activeBorder.Left - normalBorder.Left;
+                double vertDeltaTop = activeBorder.Top - normalBorder.Top;
+                double vertDeltaBottom = activeBorder.Bottom - normalBorder.Bottom;
+                offset -= horizDelta;
+                topOffset += vertDeltaTop;
+                bottomOffset -= vertDeltaBottom;
             }
             return new Thickness(offset, topOffset, 0, bottomOffset);
         }

src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TextBox.xaml

@@ -314,8 +314,11 @@
                         <Binding ElementName="LeadingPackIcon" Path="Margin" />
                         <Binding ElementName="PrefixTextBlock" Path="ActualWidth" />
                         <Binding ElementName="PrefixTextBlock" Path="Margin" />
-                        <Binding RelativeSource="{RelativeSource AncestorType=TextBox}" Path="IsMouseOver" />
-                        <Binding RelativeSource="{RelativeSource AncestorType=TextBox}" Path="IsKeyboardFocusWithin" />
+                        <Binding Path="IsMouseOver" RelativeSource="{RelativeSource TemplatedParent}" />
+                        <Binding Path="IsKeyboardFocusWithin" RelativeSource="{RelativeSource TemplatedParent}" />
+                        <Binding Path="(wpf:TextFieldAssist.HasOutlinedTextField)" RelativeSource="{RelativeSource TemplatedParent}" />
+                        <Binding Path="BorderThickness" RelativeSource="{RelativeSource TemplatedParent}" />
+                        <Binding Path="(wpf:TextFieldAssist.OutlinedBorderActiveThickness)" RelativeSource="{RelativeSource TemplatedParent}" />
                       </MultiBinding>
                     </ScrollBar.Margin>
                     <ScrollBar.Width>