Take hover/focus state into account + ignore margins on hidden elements

Author: nicolaihenriksen

src/MaterialDesignThemes.Wpf/Converters/TextBoxHorizontalScrollBarMarginConverter.cs

@@ -11,10 +11,23 @@ public class TextBoxHorizontalScrollBarMarginConverter : IMultiValueConverter
             double leadingIconWidth,
             Thickness leadingIconMargin,
             double prefixTextWidth,
-            Thickness prefixTextMargin])
+            Thickness prefixTextMargin,
+            bool isMouseOver,
+            bool hasKeyboardFocus])
         {
-            double offset = leadingIconWidth + leadingIconMargin.Left + leadingIconMargin.Right + prefixTextWidth + prefixTextMargin.Left + prefixTextMargin.Right;
-            return new Thickness(offset, 1, 0, 0);
+            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)
+            {
+                offset -= 1;
+                topOffset += 1;
+                bottomOffset -= 1;
+            }
+            return new Thickness(offset, topOffset, 0, bottomOffset);
         }
         return new Thickness(0);
     }

src/MaterialDesignThemes.Wpf/Converters/TextBoxHorizontalScrollBarWidthConverter.cs

@@ -9,7 +9,7 @@ public class TextBoxHorizontalScrollBarWidthConverter : IMultiValueConverter
     {
         if (values is [double contentHostWidth, Visibility verticalScrollBarVisibility])
         {
-            return contentHostWidth - (verticalScrollBarVisibility == Visibility.Visible ? SystemParameters.VerticalScrollBarWidth + 1 : 0);
+            return contentHostWidth - (verticalScrollBarVisibility == Visibility.Visible ? SystemParameters.VerticalScrollBarWidth : 0);
         }
         return double.NaN;
     }

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

@@ -314,6 +314,8 @@
                         <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" />
                       </MultiBinding>
                     </ScrollBar.Margin>
                     <ScrollBar.Width>