NumberBox: Fix deselecting text when opening context menu (microsoft/…

…microsoft-ui-xaml#2765)
Kinnara · Jul 3, 2020 · 15a8eaf · 15a8eaf
1 parent 8857b72
commit 15a8eaf
Showing 1 changed file with 14 additions and 5 deletions.
diff --git a/ModernWpf.Controls/NumberBox/NumberBox.cs b/ModernWpf.Controls/NumberBox/NumberBox.cs
@@ -512,7 +512,11 @@ private void StepValue(double change)
                     }
                 }
 
-                SetCurrentValue(ValueProperty, newVal); ;
+                SetCurrentValue(ValueProperty, newVal);
+
+                // We don't want the caret to move to the front of the text for example when using the up/down arrows
+                // to change the numberbox value.
+                MoveCaretToTextEnd();
             }
         }
 
@@ -536,11 +540,7 @@ private void UpdateTextToValue()
                 try
                 {
                     m_textUpdating = true;
-
                     SetCurrentValue(TextProperty, newText);
-
-                    // This places the caret at the end of the text.
-                    m_textBox.Select(newText.Length, 0);
                 }
                 finally
                 {
@@ -647,6 +647,15 @@ private void UpdateHeaderPresenterState()
             }
         }
 
+        private void MoveCaretToTextEnd()
+        {
+            if (m_textBox is { } textBox)
+            {
+                // This places the caret at the end of the text.
+                textBox.Select(textBox.Text.Length, 0);
+            }
+        }
+
         bool m_valueUpdating = false;
         bool m_textUpdating = false;