Fixing cursor disapear on right edge of text fields. (#1067)

Cleanup work with pattern matching.

Author: Keboo

MaterialDesignThemes.Wpf/TextFieldAssist.cs

@@ -68,7 +68,7 @@ public static Visibility GetDecorationVisibility(DependencyObject element)
         }
 
         /// <summary>
-        /// Controls the visbility of the filled text field.
+        /// Controls the visibility of the filled text field.
         /// </summary>
         public static readonly DependencyProperty HasFilledTextFieldProperty = DependencyProperty.RegisterAttached(
             "HasFilledTextField", typeof(bool), typeof(TextFieldAssist), new PropertyMetadata(false));
@@ -116,7 +116,7 @@ public static CornerRadius GetTextFieldCornerRadius(DependencyObject element)
         }
 
         /// <summary>
-        /// Controls the corner radius of the bottom line of the surroundig box.
+        /// Controls the corner radius of the bottom line of the surrounding box.
         /// </summary>
         public static readonly DependencyProperty UnderlineCornerRadiusProperty = DependencyProperty.RegisterAttached(
             "UnderlineCornerRadius", typeof(CornerRadius), typeof(TextFieldAssist), new PropertyMetadata(new CornerRadius(0.0)));
@@ -164,7 +164,7 @@ public static bool GetRippleOnFocusEnabled(DependencyObject element)
         }
 
         /// <summary>
-        /// Automatially inserts spelling suggestions into the text box context menu.
+        /// Automatically inserts spelling suggestions into the text box context menu.
         /// </summary>
         public static readonly DependencyProperty IncludeSpellingSuggestionsProperty = DependencyProperty.RegisterAttached(
             "IncludeSpellingSuggestions", typeof(bool), typeof(TextFieldAssist), new PropertyMetadata(default(bool), IncludeSpellingSuggestionsChanged));
@@ -181,8 +181,7 @@ public static bool GetIncludeSpellingSuggestions(TextBoxBase element)
 
         private static void IncludeSpellingSuggestionsChanged(DependencyObject element, DependencyPropertyChangedEventArgs e)
         {
-            var textBox = element as TextBoxBase;
-            if (textBox != null)
+            if (element is TextBoxBase textBox)
             {
                 if ((bool)e.NewValue)
                 {
@@ -262,13 +261,12 @@ private static void TextBoxOnContextMenuOpening(object sender, ContextMenuEventA
 
         private static SpellingError GetSpellingError(TextBoxBase textBoxBase)
         {
-            var textBox = textBoxBase as TextBox;
-            if (textBox != null)
+            if (textBoxBase is TextBox textBox)
             {
                 return textBox.GetSpellingError(textBox.CaretIndex);
             }
-            var richTextBox = textBoxBase as RichTextBox;
-            if (richTextBox != null)
+
+            if (textBoxBase is RichTextBox richTextBox)
             {
                 return richTextBox.GetSpellingError(richTextBox.CaretPosition);
             }
@@ -308,8 +306,7 @@ private static void ApplyTextBoxViewMargin(Control textBox, Thickness margin)
                 return;
             }
 
-            var frameworkElement = (textBox.Template.FindName("PART_ContentHost", textBox) as ScrollViewer)?.Content as FrameworkElement;
-            if (frameworkElement != null)
+            if ((textBox.Template.FindName("PART_ContentHost", textBox) as ScrollViewer)?.Content is FrameworkElement frameworkElement)
             {
                 frameworkElement.Margin = margin;
             }
@@ -324,8 +321,7 @@ private static void TextBoxViewMarginPropertyChangedCallback(
             DependencyObject dependencyObject,
             DependencyPropertyChangedEventArgs dependencyPropertyChangedEventArgs)
         {
-            var box = dependencyObject as Control; //could be a text box or password box
-            if (box == null)
+            if (!(dependencyObject is Control box))
             {
                 return;
             }

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TextBox.xaml

@@ -14,7 +14,7 @@
         <Setter Property="Foreground" Value="{Binding RelativeSource={RelativeSource AncestorType={x:Type FrameworkElement}}, Path=(TextElement.Foreground)}"/>
         <Setter Property="BorderBrush" Value="{DynamicResource MaterialDesignTextBoxBorder}" />
         <Setter Property="BorderThickness" Value="0 0 0 1"/>
-        <Setter Property="wpf:TextFieldAssist.TextBoxViewMargin" Value="0 0 0 0" />
+        <Setter Property="wpf:TextFieldAssist.TextBoxViewMargin" Value="0 0 1 0" />
         <Setter Property="Background" Value="Transparent"/>
         <Setter Property="CaretBrush" Value="{DynamicResource PrimaryHueMidBrush}"/>
         <Setter Property="KeyboardNavigation.TabNavigation" Value="None"/>