remove a bit of redundant code. dont colour normal border on keyboard focus (let underline do it)

Author: ButchersBoy

MaterialDesignThemes.Wpf/Themes/Generic.xaml

@@ -156,6 +156,7 @@
         <Setter Property="HorizontalAlignment" Value="Stretch"/>
         <Setter Property="VerticalAlignment" Value="Bottom"/>
         <Setter Property="Height" Value="2"/>
+        <Setter Property="IsTabStop" Value="False"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate>

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ComboBox.xaml

@@ -195,6 +195,7 @@
                 <Setter Property="Height" TargetName="dropDownBorder" Value="95"/>
             </Trigger>
             <Trigger Property="IsKeyboardFocused" Value="True">
+                <Setter TargetName="Underline" Property="IsActive" Value="True"/>
             </Trigger>
             <MultiTrigger>
                 <MultiTrigger.Conditions>
@@ -311,6 +312,7 @@
                 <Setter Property="Height" TargetName="dropDownBorder" Value="95"/>
             </Trigger>
             <Trigger Property="IsKeyboardFocused" Value="True">
+                <Setter TargetName="Underline" Property="IsActive" Value="True"/>
             </Trigger>
             <MultiTrigger>
                 <MultiTrigger.Conditions>
@@ -381,7 +383,7 @@
 				    <TextBox x:Name="PART_EditableTextBox" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}" Style="{StaticResource MaterialDesignComboBoxEditableTextBox}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
                 </Grid>
             </Border>
-            <wpf:Underline x:Name="Underline" Grid.ColumnSpan="2" BindIsKeyboardFocused="False"/>
+            <wpf:Underline x:Name="Underline" Grid.ColumnSpan="2" />
         </Grid>
 		<ControlTemplate.Triggers>
 			<Trigger Property="HasDropShadow" SourceName="PART_Popup" Value="true">
@@ -491,7 +493,7 @@
                              VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
                 </Grid>
             </Border>
-            <wpf:Underline x:Name="Underline" Grid.ColumnSpan="2" BindIsKeyboardFocused="False"/>
+            <wpf:Underline x:Name="Underline" Grid.ColumnSpan="2" />
         </Grid>
         <ControlTemplate.Triggers>
             <Trigger Property="wpf:TextFieldAssist.IsNullOrEmpty" Value="False">

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.DatePicker.xaml

@@ -156,7 +156,7 @@
 					    			   PopupAnimation="Fade"  />
                             </Grid>
                         </Border>
-                        <wpf:Underline x:Name="Underline" BindIsKeyboardFocused="False"/>
+                        <wpf:Underline x:Name="Underline" />
                     </Grid>
                     <ControlTemplate.Triggers>
 						<Trigger Property="IsEnabled" Value="false">

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.PasswordBox.xaml

@@ -56,7 +56,7 @@
                             <Setter Property="BorderBrush" Value="{DynamicResource PrimaryHueMidBrush}"/>
                         </Trigger>
                         <Trigger Property="IsKeyboardFocused" Value="true">
-                            <Setter Property="BorderBrush"  Value="{DynamicResource PrimaryHueMidBrush}"/>
+                            <Setter TargetName="Underline" Property="IsActive" Value="True"/>
                         </Trigger>
                         <Trigger Property="Validation.HasError" Value="true">
                             <Setter Property="BorderBrush" Value="{DynamicResource ValidationErrorBrush}"/>

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TextBox.xaml

@@ -55,7 +55,7 @@
                             <Setter Property="BorderBrush" Value="{DynamicResource PrimaryHueMidBrush}"/>
                         </Trigger>
                         <Trigger Property="IsKeyboardFocused" Value="true">
-                            <Setter Property="BorderBrush"  Value="{DynamicResource PrimaryHueMidBrush}"/>
+                            <Setter TargetName="Underline" Property="IsActive" Value="True"/>
                         </Trigger>
                         <Trigger Property="Validation.HasError" Value="true">
                             <Setter Property="BorderBrush" Value="{DynamicResource ValidationErrorBrush}"/>
@@ -172,7 +172,7 @@
                         </Trigger>
 
                         <Trigger Property="IsKeyboardFocused" Value="true">
-                            <Setter Property="BorderBrush"  Value="{DynamicResource PrimaryHueMidBrush}"/>
+                            <Setter TargetName="Underline" Property="IsActive" Value="True"/>                            
                         </Trigger>
 
                         <Trigger Property="Validation.HasError" Value="true">

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TimePicker.xaml

@@ -12,6 +12,7 @@
 		<Setter Property="Background" Value="Transparent"/>
 		<Setter Property="BorderThickness" Value="0 0 0 1"/>
 		<Setter Property="HorizontalContentAlignment" Value="Stretch"/>
+        <Setter Property="IsTabStop" Value="False"/>
         <Setter Property="wpf:TextFieldAssist.Hint" Value="Select time" />
 		<Setter Property="ClockStyle" Value="{DynamicResource MaterialDesignClock}" />
 		<Setter Property="ClockHostContentControlStyle">
@@ -97,7 +98,7 @@
 						    		   PopupAnimation="Fade"/>
 						    </Grid>
                         </Border>
-                        <wpf:Underline x:Name="Underline" BindIsKeyboardFocused="False"/>
+                        <wpf:Underline x:Name="Underline" />
                     </Grid>
                     <ControlTemplate.Triggers>
 						<Trigger Property="IsMouseOver" Value="true">

MaterialDesignThemes.Wpf/Underline.cs

@@ -16,16 +16,6 @@ static Underline()
             DefaultStyleKeyProperty.OverrideMetadata(typeof(Underline), new FrameworkPropertyMetadata(typeof(Underline)));
         }
 
-        public static readonly DependencyProperty BindIsKeyboardFocusedProperty = DependencyProperty.Register(
-            "BindIsKeyboardFocused", typeof(bool), typeof(Underline),
-            new FrameworkPropertyMetadata(true, FrameworkPropertyMetadataOptions.AffectsRender, BindIsKeyboardFocusedPropertyChangedCallback));
-
-        public bool BindIsKeyboardFocused
-        {
-            get { return (bool)GetValue(BindIsKeyboardFocusedProperty); }
-            set { SetValue(BindIsKeyboardFocusedProperty, value); }
-        }
-
         public static readonly DependencyProperty IsActiveProperty = DependencyProperty.Register(
             "IsActive", typeof(bool), typeof(Underline),
             new FrameworkPropertyMetadata(false, FrameworkPropertyMetadataOptions.AffectsRender));
@@ -34,41 +24,6 @@ public bool IsActive
         {
             get { return (bool)GetValue(IsActiveProperty); }
             set { SetValue(IsActiveProperty, value); }
-        }
-
-        private void UpdateBindIsKeyboardFocused()
-        {
-            if (BindIsKeyboardFocused)
-            {
-                BindingOperations.ClearBinding(this, Underline.IsActiveProperty);
-
-                var uiElement = TemplatedParent as UIElement;
-                if (uiElement != null)
-                {
-                    Binding isKeyboardFocusedBinding = new Binding
-                    {
-                        Path = new PropertyPath("IsKeyboardFocused"),
-                        Source = uiElement
-                    };
-                    this.SetBinding(Underline.IsActiveProperty, isKeyboardFocusedBinding);
-                }
-            }
-            else
-            {
-                BindingOperations.ClearBinding(this, Underline.IsActiveProperty);
-            }
-        }
-
-        private static void BindIsKeyboardFocusedPropertyChangedCallback(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            (d as Underline)?.UpdateBindIsKeyboardFocused();
-        }
-
-        public override void OnApplyTemplate()
-        {
-            base.OnApplyTemplate();
-
-            UpdateBindIsKeyboardFocused();
-        }
+        }        
     }
 }