Update NumericUpDown.cs

This commit is contained in:
NaBian committed 2019-08-07 22:58:26 +08:00
1 parent 2241a588ec
commit 0f2cb24a3b
1 file changed
+18 -11
@@ -1,6 +1,7 @@
using System; using System;
using System.Windows; using System.Windows;
using System.Windows.Controls; using System.Windows.Controls;
using System.Windows.Documents;
using System.Windows.Input; using System.Windows.Input;
using HandyControl.Data; using HandyControl.Data;
using HandyControl.Interactivity; using HandyControl.Interactivity;
@@ -65,7 +66,8 @@ namespace HandyControl.Controls
{ {
if (_textBox != null) if (_textBox != null)
{ {
_textBox.TextChanged -= TextBox_TextChanged; TextCompositionManager.RemovePreviewTextInputHandler(_textBox, PreviewTextInputHandler);
_textBox.TextChanged -= _textBox_TextChanged;
_textBox.PreviewKeyDown -= TextBox_PreviewKeyDown; _textBox.PreviewKeyDown -= TextBox_PreviewKeyDown;
_textBox.LostFocus -= TextBox_LostFocus; _textBox.LostFocus -= TextBox_LostFocus;
} }
@@ -76,13 +78,27 @@ namespace HandyControl.Controls
if (_textBox != null) if (_textBox != null)
{ {
_textBox.TextChanged += TextBox_TextChanged; TextCompositionManager.AddPreviewTextInputHandler(_textBox, PreviewTextInputHandler);
_textBox.TextChanged += _textBox_TextChanged;
_textBox.PreviewKeyDown += TextBox_PreviewKeyDown; _textBox.PreviewKeyDown += TextBox_PreviewKeyDown;
_textBox.LostFocus += TextBox_LostFocus; _textBox.LostFocus += TextBox_LostFocus;
_textBox.Text = CurrentText; _textBox.Text = CurrentText;
} }
} }
private void _textBox_TextChanged(object sender, TextChangedEventArgs e) => UpdateData();
private void UpdateData()
{
if (!VerifyData()) return;
if (double.TryParse(_textBox.Text, out var value))
{
Value = value;
}
}
private void PreviewTextInputHandler(object sender, TextCompositionEventArgs e) => UpdateData();
private void TextBox_LostFocus(object sender, RoutedEventArgs e) private void TextBox_LostFocus(object sender, RoutedEventArgs e)
{ {
if (IsError) return; if (IsError) return;
@@ -103,15 +119,6 @@ namespace HandyControl.Controls
} }
} }
private void TextBox_TextChanged(object sender, TextChangedEventArgs e)
{
if (!VerifyData()) return;
if (double.TryParse(_textBox.Text, out var value))
{
Value = value;
}
}
protected override void OnMouseWheel(MouseWheelEventArgs e) protected override void OnMouseWheel(MouseWheelEventArgs e)
{ {
base.OnMouseWheel(e); base.OnMouseWheel(e);