From f28fa3ad84e67a12d4ba77a7cf4a5adcbe77efe0 Mon Sep 17 00:00:00 2001 From: GF-Huang Date: Mon, 23 Nov 2020 21:35:14 +0800 Subject: [PATCH 1/4] Add "StringFormat" property for NumericUpDown control. --- .../Controls/NumericUpDownDemoCtl.xaml | 6 ++++ .../Controls/Input/NumericUpDown.cs | 33 +++++++++++++++++-- 2 files changed, 36 insertions(+), 3 deletions(-) diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/NumericUpDownDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/NumericUpDownDemoCtl.xaml index ccebf3aa..433afce9 100644 --- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/NumericUpDownDemoCtl.xaml +++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/NumericUpDownDemoCtl.xaml @@ -16,6 +16,12 @@ + diff --git a/src/Shared/HandyControl_Shared/Controls/Input/NumericUpDown.cs b/src/Shared/HandyControl_Shared/Controls/Input/NumericUpDown.cs index 28dbba39..d2e4dbd4 100644 --- a/src/Shared/HandyControl_Shared/Controls/Input/NumericUpDown.cs +++ b/src/Shared/HandyControl_Shared/Controls/Input/NumericUpDown.cs @@ -153,9 +153,21 @@ namespace HandyControl.Controls } } - private string CurrentText => DecimalPlaces.HasValue - ? Value.ToString($"#0.{new string('0', DecimalPlaces.Value)}") - : Value.ToString("#0"); + private string CurrentText + { + get + { + if (string.IsNullOrWhiteSpace(StringFormat)) + { + return DecimalPlaces.HasValue ? Value.ToString($"#0.{new string('0', DecimalPlaces.Value)}") : + Value.ToString("#0"); + } + else + { + return Value.ToString(StringFormat); + } + } + } protected virtual void OnValueChanged(FunctionEventArgs e) => RaiseEvent(e); @@ -318,6 +330,21 @@ namespace HandyControl.Controls set => SetValue(DecimalPlacesProperty, value); } + /// + /// 指示要显示的数字的格式 + /// + public static readonly DependencyProperty StringFormatProperty = + DependencyProperty.Register("StringFormat", typeof(string), typeof(NumericUpDown), new PropertyMetadata(default(string))); + + /// + /// 指示要显示的数字的格式，这将会覆盖 属性 + /// + public string StringFormat + { + get { return (string)GetValue(StringFormatProperty); } + set { SetValue(StringFormatProperty, value); } + } + /// /// 是否显示上下调值按钮 /// From d151764e954d176c6aa2b6ff36b2fd1b9bec0fde Mon Sep 17 00:00:00 2001 From: NaBian <836904362@qq.com> Date: Mon, 23 Nov 2020 22:30:27 +0800 Subject: [PATCH 2/4] Update MainWindowContent.xaml --- .../UserControl/Main/MainWindowContent.xaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Main/MainWindowContent.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Main/MainWindowContent.xaml index 28866da5..ebe732ab 100644 --- a/src/Shared/HandyControlDemo_Shared/UserControl/Main/MainWindowContent.xaml +++ b/src/Shared/HandyControlDemo_Shared/UserControl/Main/MainWindowContent.xaml @@ -13,7 +13,7 @@ - + From b4d26dd2fad8f5c3a3f1b0d83c5cd8faed0ed432 Mon Sep 17 00:00:00 2001 From: NaBian <836904362@qq.com> Date: Wed, 25 Nov 2020 21:45:16 +0800 Subject: [PATCH 3/4] rename StringFormat property --- .../Controls/NumericUpDownDemoCtl.xaml | 8 +---- .../Controls/Input/NumericUpDown.cs | 30 +++++++------------ 2 files changed, 11 insertions(+), 27 deletions(-) diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/NumericUpDownDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/NumericUpDownDemoCtl.xaml index 433afce9..e09deb85 100644 --- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/NumericUpDownDemoCtl.xaml +++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/NumericUpDownDemoCtl.xaml @@ -15,13 +15,7 @@ - - + diff --git a/src/Shared/HandyControl_Shared/Controls/Input/NumericUpDown.cs b/src/Shared/HandyControl_Shared/Controls/Input/NumericUpDown.cs index d2e4dbd4..cc544656 100644 --- a/src/Shared/HandyControl_Shared/Controls/Input/NumericUpDown.cs +++ b/src/Shared/HandyControl_Shared/Controls/Input/NumericUpDown.cs @@ -153,21 +153,11 @@ namespace HandyControl.Controls } } - private string CurrentText - { - get - { - if (string.IsNullOrWhiteSpace(StringFormat)) - { - return DecimalPlaces.HasValue ? Value.ToString($"#0.{new string('0', DecimalPlaces.Value)}") : - Value.ToString("#0"); - } - else - { - return Value.ToString(StringFormat); - } - } - } + private string CurrentText => string.IsNullOrWhiteSpace(ValueFormat) + ? DecimalPlaces.HasValue + ? Value.ToString($"#0.{new string('0', DecimalPlaces.Value)}") + : Value.ToString("#0") + : Value.ToString(ValueFormat); protected virtual void OnValueChanged(FunctionEventArgs e) => RaiseEvent(e); @@ -333,16 +323,16 @@ namespace HandyControl.Controls /// /// 指示要显示的数字的格式 /// - public static readonly DependencyProperty StringFormatProperty = - DependencyProperty.Register("StringFormat", typeof(string), typeof(NumericUpDown), new PropertyMetadata(default(string))); + public static readonly DependencyProperty ValueFormatProperty = DependencyProperty.Register( + "ValueFormat", typeof(string), typeof(NumericUpDown), new PropertyMetadata(default(string))); /// /// 指示要显示的数字的格式，这将会覆盖 属性 /// - public string StringFormat + public string ValueFormat { - get { return (string)GetValue(StringFormatProperty); } - set { SetValue(StringFormatProperty, value); } + get => (string) GetValue(ValueFormatProperty); + set => SetValue(ValueFormatProperty, value); } /// From 34380e054471596d6b0a5a261b2c5e3b868ddd9b Mon Sep 17 00:00:00 2001 From: NaBian <836904362@qq.com> Date: Wed, 25 Nov 2020 22:23:21 +0800 Subject: [PATCH 4/4] close #462 #464 --- README-cn.md | 1 + README.md | 1 + .../Themes/Styles/Base/TreeViewBaseStyle.xaml | 4 ++-- .../Themes/Styles/Base/TreeViewBaseStyle.xaml | 4 ++-- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/README-cn.md b/README-cn.md index d0a470f5..0c95a29d 100644 --- a/README-cn.md +++ b/README-cn.md @@ -55,6 +55,7 @@ varKeytrap xsnakes mmasdivins +GF-Huang ## Backers diff --git a/README.md b/README.md index 1a2ccc4b..28263db4 100644 --- a/README.md +++ b/README.md @@ -55,6 +55,7 @@ varKeytrap xsnakes mmasdivins +GF-Huang ## Backers diff --git a/src/Net_40/HandyControl_Net_40/Themes/Styles/Base/TreeViewBaseStyle.xaml b/src/Net_40/HandyControl_Net_40/Themes/Styles/Base/TreeViewBaseStyle.xaml index b12fe5f4..ccb95675 100644 --- a/src/Net_40/HandyControl_Net_40/Themes/Styles/Base/TreeViewBaseStyle.xaml +++ b/src/Net_40/HandyControl_Net_40/Themes/Styles/Base/TreeViewBaseStyle.xaml @@ -53,10 +53,10 @@ - + - + diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/TreeViewBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/TreeViewBaseStyle.xaml index 336e566b..8c3f9c19 100644 --- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/TreeViewBaseStyle.xaml +++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/TreeViewBaseStyle.xaml @@ -53,10 +53,10 @@ - + - +