From 4dc70da3215c94ec97e01f6f14ba21f443d7a6f2 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Fri, 15 Jan 2021 21:30:10 +0800
Subject: [PATCH 01/15] use SetDataObject instead of SetText
---
src/Shared/HandyControl_Shared/Controls/Window/MessageBox.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/Shared/HandyControl_Shared/Controls/Window/MessageBox.cs b/src/Shared/HandyControl_Shared/Controls/Window/MessageBox.cs
index 8300f7d6..929bc779 100644
--- a/src/Shared/HandyControl_Shared/Controls/Window/MessageBox.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Window/MessageBox.cs
@@ -211,7 +211,7 @@ namespace HandyControl.Controls
builder.Append(Environment.NewLine);
builder.Append(line);
builder.Append(Environment.NewLine);
- Clipboard.SetText(builder.ToString());
+ Clipboard.SetDataObject(builder.ToString());
}
}
From a837bb1e2453f8c6576cd4b054d1a777e4e3104d Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Fri, 15 Jan 2021 22:40:45 +0800
Subject: [PATCH 02/15] update Expander & GroupBox styles
---
README-cn.md | 8 ++---
README.md | 8 ++---
.../HandyControl_Net_40/Themes/Theme.xaml | 33 +++++++++--------
.../UserControl/Styles/ExpanderDemoCtl.xaml | 8 ++---
.../UserControl/Styles/GroupBoxDemoCtl.xaml | 16 ++++-----
.../Controls/Window/MessageBox.cs | 10 +++++-
.../Themes/Styles/Base/ExpanderBaseStyle.xaml | 8 ++---
.../Themes/Styles/Base/GroupBoxBaseStyle.xaml | 13 +++----
.../Styles/Base/PropertyGridBaseStyle.xaml | 4 +--
.../HandyControl_Shared/Themes/Theme.xaml | 35 ++++++++-----------
10 files changed, 75 insertions(+), 68 deletions(-)
diff --git a/README-cn.md b/README-cn.md
index 441e1ebe..599dca92 100644
--- a/README-cn.md
+++ b/README-cn.md
@@ -131,6 +131,10 @@ Step 4: Enjoy coding
## Latest examples
+### UniformSpacingPanel
+
+
+
### FlexPanel
@@ -147,10 +151,6 @@ Step 4: Enjoy coding
-### UniformSpacingPanel
-
-
-
## History publication
### Screenshot
diff --git a/README.md b/README.md
index ed7bdc4d..bd8f22dd 100644
--- a/README.md
+++ b/README.md
@@ -131,6 +131,10 @@ Step 4: Enjoy coding
## Latest examples
+### UniformSpacingPanel
+
+
+
### FlexPanel
@@ -147,10 +151,6 @@ Step 4: Enjoy coding
-### UniformSpacingPanel
-
-
-
## History publication
### Screenshot
diff --git a/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml b/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
index e2dcba11..af5dd49c 100644
--- a/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
+++ b/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
@@ -527,7 +527,7 @@
-
+
@@ -541,7 +541,7 @@
-
+
@@ -2059,7 +2059,7 @@
-
\ No newline at end of file
+
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/PropertyGridBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/PropertyGridBaseStyle.xaml
index 8810e698..d50b7361 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/PropertyGridBaseStyle.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/PropertyGridBaseStyle.xaml
@@ -114,7 +114,7 @@
-
+
@@ -163,4 +163,4 @@
-
\ No newline at end of file
+
diff --git a/src/Shared/HandyControl_Shared/Themes/Theme.xaml b/src/Shared/HandyControl_Shared/Themes/Theme.xaml
index c2840a9e..92dd017d 100644
--- a/src/Shared/HandyControl_Shared/Themes/Theme.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Theme.xaml
@@ -83,9 +83,6 @@
M2,12 C3.1045694,12 4,12.895431 4,14 4,15.104569 3.1045694,16 2,16 0.89543051,16 0,15.104569 0,14 0,12.895431 0.89543051,12 2,12 z M2,6 C3.1045694,6 4,6.8954306 4,8 4,9.1045694 3.1045694,10 2,10 0.89543051,10 0,9.1045694 0,8 0,6.8954306 0.89543051,6 2,6 z M2,0 C3.1045694,0 4,0.89543056 4,2 4,3.1045694 3.1045694,4 2,4 0.89543051,4 0,3.1045694 0,2 0,0.89543056 0.89543051,0 2,0 z
M14,0 C15.104569,0 16,0.89543051 16,2 16,3.1045694 15.104569,4 14,4 12.895431,4 12,3.1045694 12,2 12,0.89543051 12.895431,0 14,0 z M8,0 C9.1045694,0 10,0.89543051 10,2 10,3.1045694 9.1045694,4 8,4 6.8954306,4 6,3.1045694 6,2 6,0.89543051 6.8954306,0 8,0 z M2,0 C3.1045694,0 4,0.89543051 4,2 4,3.1045694 3.1045694,4 2,4 0.89543056,4 0,3.1045694 0,2 0,0.89543051 0.89543056,0 2,0 z
M798.165333 97.834667a42.624 42.624 0 0 0-60.330666 0l-140.629334 140.629333-55.381333-55.296-60.330667 60.330667 55.381334 55.296-353.706667 353.706666a42.709333 42.709333 0 0 0-11.221333 19.84l-42.666667 170.666667a42.538667 42.538667 0 0 0 51.712 51.712l170.666667-42.666667c7.509333-1.877333 14.378667-5.76 19.84-11.221333l353.792-353.792 55.210666 55.125333 60.330667-60.330666-55.210667-55.125334 140.544-140.544a42.624 42.624 0 0 0 0-60.330666l-128-128zM319.488 772.138667l-90.197333 22.570666 22.570666-90.197333 345.386667-345.386667 67.669333 67.584-345.429333 345.429334z
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Shared/HandyControl_Shared/Themes/Theme.xaml b/src/Shared/HandyControl_Shared/Themes/Theme.xaml
index 97b9766c..e764d8cf 100644
--- a/src/Shared/HandyControl_Shared/Themes/Theme.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Theme.xaml
@@ -8334,6 +8334,140 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
\ No newline at end of file
+
diff --git a/src/Net_40/HandyControl_Net_40/Themes/Styles/DataGrid.xaml b/src/Net_40/HandyControl_Net_40/Themes/Styles/DataGrid.xaml
index 424e47fa..659adf27 100644
--- a/src/Net_40/HandyControl_Net_40/Themes/Styles/DataGrid.xaml
+++ b/src/Net_40/HandyControl_Net_40/Themes/Styles/DataGrid.xaml
@@ -290,41 +290,48 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
\ No newline at end of file
+
diff --git a/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml b/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
index 68decf1d..cbbcab06 100644
--- a/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
+++ b/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
@@ -8216,6 +8216,41 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -8762,9 +8797,16 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -11061,9 +11103,16 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -11618,37 +11667,44 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -11663,6 +11719,7 @@
+
diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.Designer.cs b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.Designer.cs
index 92afe96c..50444d69 100644
--- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.Designer.cs
+++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.Designer.cs
@@ -729,6 +729,17 @@ namespace HandyControlDemo.Properties.Langs
}
}
+ ///
+ /// 查找类似 空状态 的本地化字符串。
+ ///
+ public static string Empty
+ {
+ get
+ {
+ return ResourceManager.GetString("Empty", resourceCulture);
+ }
+ }
+
///
/// 查找类似 错误 的本地化字符串。
///
diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ca-ES.resx b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ca-ES.resx
index ab4fcc5b..f1f00611 100644
--- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ca-ES.resx
+++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ca-ES.resx
@@ -792,4 +792,7 @@
Feedback
+
+ Empty
+
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx
index c2ea44b9..83434bcd 100644
--- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx
+++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx
@@ -792,4 +792,7 @@
Feedback
+
+ Empty
+
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fa.resx b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fa.resx
index a087fbb0..79896305 100644
--- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fa.resx
+++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fa.resx
@@ -792,4 +792,7 @@
Feedback
+
+ Empty
+
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fr.resx b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fr.resx
index af4dc2f5..dc8c74ba 100644
--- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fr.resx
+++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fr.resx
@@ -792,4 +792,7 @@
Feedback
+
+ Empty
+
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ko-KR.resx b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ko-KR.resx
index eeea3d08..045f36be 100644
--- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ko-KR.resx
+++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ko-KR.resx
@@ -792,4 +792,7 @@
Feedback
+
+ Empty
+
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.pt-BR.resx b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.pt-BR.resx
index b84489cb..75e37f07 100644
--- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.pt-BR.resx
+++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.pt-BR.resx
@@ -792,4 +792,7 @@
Feedback
+
+ Empty
+
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.resx b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.resx
index 987f4790..d0db53b2 100644
--- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.resx
+++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.resx
@@ -792,4 +792,7 @@
反馈
+
+ 空状态
+
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ru.resx b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ru.resx
index 0df61c8b..d50b468e 100644
--- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ru.resx
+++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ru.resx
@@ -792,4 +792,7 @@
Feedback
+
+ Empty
+
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.tr.resx b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.tr.resx
index 78bcd8dc..aa64d6a7 100644
--- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.tr.resx
+++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.tr.resx
@@ -792,4 +792,7 @@
Feedback
+
+ Empty
+
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/LangProvider.cs b/src/Shared/HandyControlDemo_Shared/Properties/Langs/LangProvider.cs
index 4f0a5a34..89ab8eb6 100644
--- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/LangProvider.cs
+++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/LangProvider.cs
@@ -97,6 +97,7 @@ namespace HandyControlDemo.Properties.Langs
OnPropertyChanged(nameof(Drawer));
OnPropertyChanged(nameof(Effects));
OnPropertyChanged(nameof(Email));
+ OnPropertyChanged(nameof(Empty));
OnPropertyChanged(nameof(Error));
OnPropertyChanged(nameof(Exit));
OnPropertyChanged(nameof(Expander));
@@ -564,6 +565,11 @@ namespace HandyControlDemo.Properties.Langs
///
public string Email => Lang.Email;
+ ///
+ /// 查找类似 空状态 的本地化字符串。
+ ///
+ public string Empty => Lang.Empty;
+
///
/// 查找类似 错误 的本地化字符串。
///
@@ -1698,6 +1704,11 @@ namespace HandyControlDemo.Properties.Langs
///
public static string Email = nameof(Email);
+ ///
+ /// 查找类似 空状态 的本地化字符串。
+ ///
+ public static string Empty = nameof(Empty);
+
///
/// 查找类似 错误 的本地化字符串。
///
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DrawerDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DrawerDemoCtl.xaml
index 79aa5cd5..8fc96b49 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DrawerDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DrawerDemoCtl.xaml
@@ -5,22 +5,6 @@
Background="{DynamicResource RegionBrush}">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -69,6 +53,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
\ No newline at end of file
+
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeProgressBarDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeProgressBarDemoCtl.xaml
index aecf271e..890e3624 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeProgressBarDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeProgressBarDemoCtl.xaml
@@ -14,7 +14,7 @@
-
+
@@ -36,7 +36,7 @@
-
+
diff --git a/src/Shared/HandyControl_Shared/Controls/Other/Empty.cs b/src/Shared/HandyControl_Shared/Controls/Other/Empty.cs
new file mode 100644
index 00000000..4fb03460
--- /dev/null
+++ b/src/Shared/HandyControl_Shared/Controls/Other/Empty.cs
@@ -0,0 +1,26 @@
+using System.Windows;
+using System.Windows.Controls;
+
+namespace HandyControl.Controls
+{
+ public class Empty : ContentControl
+ {
+ public static readonly DependencyProperty DescriptionProperty = DependencyProperty.Register(
+ "Description", typeof(object), typeof(Empty), new PropertyMetadata(default(object)));
+
+ public object Description
+ {
+ get => GetValue(DescriptionProperty);
+ set => SetValue(DescriptionProperty, value);
+ }
+
+ public static readonly DependencyProperty LogoProperty = DependencyProperty.Register(
+ "Logo", typeof(object), typeof(Empty), new PropertyMetadata(default(object)));
+
+ public object Logo
+ {
+ get => GetValue(LogoProperty);
+ set => SetValue(LogoProperty, value);
+ }
+ }
+}
diff --git a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
index d442837f..d603f191 100644
--- a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
+++ b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
@@ -39,6 +39,7 @@
+
@@ -917,6 +918,12 @@
Designer
+
+ Designer
+
+
+ Designer
+
Designer
MSBuild:Compile
diff --git a/src/Shared/HandyControl_Shared/Properties/Langs/Lang.Designer.cs b/src/Shared/HandyControl_Shared/Properties/Langs/Lang.Designer.cs
index 06b51481..e5704b57 100644
--- a/src/Shared/HandyControl_Shared/Properties/Langs/Lang.Designer.cs
+++ b/src/Shared/HandyControl_Shared/Properties/Langs/Lang.Designer.cs
@@ -306,7 +306,18 @@ namespace HandyControl.Properties.Langs {
return ResourceManager.GetString("No", resourceCulture);
}
}
-
+
+ ///
+ /// 查找类似 暂无数据 的本地化字符串。
+ ///
+ public static string NoData
+ {
+ get
+ {
+ return ResourceManager.GetString("NoData", resourceCulture);
+ }
+ }
+
///
/// 查找类似 不在范围内 的本地化字符串。
///
diff --git a/src/Shared/HandyControl_Shared/Properties/Langs/Lang.ca-ES.resx b/src/Shared/HandyControl_Shared/Properties/Langs/Lang.ca-ES.resx
index 7bfd9b4c..eac43b1b 100644
--- a/src/Shared/HandyControl_Shared/Properties/Langs/Lang.ca-ES.resx
+++ b/src/Shared/HandyControl_Shared/Properties/Langs/Lang.ca-ES.resx
@@ -240,4 +240,7 @@
Tots
+
+ No Data
+
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Properties/Langs/Lang.en.resx b/src/Shared/HandyControl_Shared/Properties/Langs/Lang.en.resx
index b12aa4f1..412e6a4d 100644
--- a/src/Shared/HandyControl_Shared/Properties/Langs/Lang.en.resx
+++ b/src/Shared/HandyControl_Shared/Properties/Langs/Lang.en.resx
@@ -240,4 +240,7 @@
All
+
+ No Data
+
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Properties/Langs/Lang.fa.resx b/src/Shared/HandyControl_Shared/Properties/Langs/Lang.fa.resx
index aa869a08..e468136c 100644
--- a/src/Shared/HandyControl_Shared/Properties/Langs/Lang.fa.resx
+++ b/src/Shared/HandyControl_Shared/Properties/Langs/Lang.fa.resx
@@ -240,4 +240,7 @@
All
+
+ No Data
+
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Properties/Langs/Lang.fr.resx b/src/Shared/HandyControl_Shared/Properties/Langs/Lang.fr.resx
index 14180e25..1358f21f 100644
--- a/src/Shared/HandyControl_Shared/Properties/Langs/Lang.fr.resx
+++ b/src/Shared/HandyControl_Shared/Properties/Langs/Lang.fr.resx
@@ -240,4 +240,7 @@
All
+
+ No Data
+
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Properties/Langs/Lang.ko-KR.resx b/src/Shared/HandyControl_Shared/Properties/Langs/Lang.ko-KR.resx
index 74be0fba..67ae01fe 100644
--- a/src/Shared/HandyControl_Shared/Properties/Langs/Lang.ko-KR.resx
+++ b/src/Shared/HandyControl_Shared/Properties/Langs/Lang.ko-KR.resx
@@ -240,4 +240,7 @@
All
+
+ No Data
+
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Properties/Langs/Lang.pt-BR.resx b/src/Shared/HandyControl_Shared/Properties/Langs/Lang.pt-BR.resx
index 724099b7..1d791361 100644
--- a/src/Shared/HandyControl_Shared/Properties/Langs/Lang.pt-BR.resx
+++ b/src/Shared/HandyControl_Shared/Properties/Langs/Lang.pt-BR.resx
@@ -240,4 +240,7 @@
All
+
+ No Data
+
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Properties/Langs/Lang.resx b/src/Shared/HandyControl_Shared/Properties/Langs/Lang.resx
index 5b9d9f8d..c684505a 100644
--- a/src/Shared/HandyControl_Shared/Properties/Langs/Lang.resx
+++ b/src/Shared/HandyControl_Shared/Properties/Langs/Lang.resx
@@ -240,4 +240,7 @@
全部
+
+ 暂无数据
+
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Properties/Langs/Lang.ru.resx b/src/Shared/HandyControl_Shared/Properties/Langs/Lang.ru.resx
index 35b6367a..c5dee7fc 100644
--- a/src/Shared/HandyControl_Shared/Properties/Langs/Lang.ru.resx
+++ b/src/Shared/HandyControl_Shared/Properties/Langs/Lang.ru.resx
@@ -240,4 +240,7 @@
All
+
+ No Data
+
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Properties/Langs/Lang.tr.resx b/src/Shared/HandyControl_Shared/Properties/Langs/Lang.tr.resx
index ea40fa6f..0a68273e 100644
--- a/src/Shared/HandyControl_Shared/Properties/Langs/Lang.tr.resx
+++ b/src/Shared/HandyControl_Shared/Properties/Langs/Lang.tr.resx
@@ -240,4 +240,7 @@
All
+
+ No Data
+
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Properties/Langs/LangProvider.cs b/src/Shared/HandyControl_Shared/Properties/Langs/LangProvider.cs
index 6a7cd365..834aa228 100644
--- a/src/Shared/HandyControl_Shared/Properties/Langs/LangProvider.cs
+++ b/src/Shared/HandyControl_Shared/Properties/Langs/LangProvider.cs
@@ -63,6 +63,7 @@ namespace HandyControl.Properties.Langs
OnPropertyChanged(nameof(LangComment));
OnPropertyChanged(nameof(NextPage));
OnPropertyChanged(nameof(No));
+ OnPropertyChanged(nameof(NoData));
OnPropertyChanged(nameof(OutOfRange));
OnPropertyChanged(nameof(PageMode));
OnPropertyChanged(nameof(Pm));
@@ -209,6 +210,11 @@ namespace HandyControl.Properties.Langs
///
public string No => Lang.No;
+ ///
+ /// 查找类似 暂无数据 的本地化字符串。
+ ///
+ public string NoData => Lang.NoData;
+
///
/// 查找类似 不在范围内 的本地化字符串。
///
@@ -418,6 +424,11 @@ namespace HandyControl.Properties.Langs
///
public static string No = nameof(No);
+ ///
+ /// 查找类似 暂无数据 的本地化字符串。
+ ///
+ public static string NoData = nameof(NoData);
+
///
/// 查找类似 不在范围内 的本地化字符串。
///
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/EmptyBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/EmptyBaseStyle.xaml
new file mode 100644
index 00000000..763cb47b
--- /dev/null
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/EmptyBaseStyle.xaml
@@ -0,0 +1,45 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/ListBoxBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ListBoxBaseStyle.xaml
index a796b0fa..3f7f29e8 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/ListBoxBaseStyle.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ListBoxBaseStyle.xaml
@@ -80,13 +80,20 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
-
\ No newline at end of file
+
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/TreeViewBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/TreeViewBaseStyle.xaml
index 8c3f9c19..393bc5aa 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/TreeViewBaseStyle.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/TreeViewBaseStyle.xaml
@@ -107,10 +107,17 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
@@ -136,4 +143,4 @@
-
\ No newline at end of file
+
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/DataGrid.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/DataGrid.xaml
index d975fd3e..022bacd2 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/DataGrid.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/DataGrid.xaml
@@ -289,37 +289,44 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -335,4 +342,4 @@
-
\ No newline at end of file
+
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Empty.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Empty.xaml
new file mode 100644
index 00000000..419906fb
--- /dev/null
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Empty.xaml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/Shared/HandyControl_Shared/Themes/Theme.xaml b/src/Shared/HandyControl_Shared/Themes/Theme.xaml
index e764d8cf..f333bda3 100644
--- a/src/Shared/HandyControl_Shared/Themes/Theme.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Theme.xaml
@@ -8334,6 +8334,41 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -8880,9 +8915,16 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -11179,10 +11221,17 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
@@ -11750,37 +11799,44 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -11804,6 +11860,7 @@
+
@@ -12038,27 +12095,23 @@
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
diff --git a/src/Shared/HandyControl_Shared/Themes/Theme_40.txt b/src/Shared/HandyControl_Shared/Themes/Theme_40.txt
index ef92aafb..d4772aff 100644
--- a/src/Shared/HandyControl_Shared/Themes/Theme_40.txt
+++ b/src/Shared/HandyControl_Shared/Themes/Theme_40.txt
@@ -82,6 +82,7 @@ Styles\Base\DateTimePickerBaseStyle.xaml
Styles\Base\DialogBaseStyle.xaml
Styles\Base\DividerBaseStyle.xaml
Styles\Base\DrawerBaseStyle.xaml
+Styles\Base\EmptyBaseStyle.xaml
Styles\Base\ExpanderBaseStyle.xaml
Styles\Base\FlowDocumentBaseStyle.xaml
Styles\Base\FrameBaseStyle.xaml
@@ -134,6 +135,7 @@ Styles\DateTimePicker.xaml
Styles\Dialog.xaml
Styles\Divider.xaml
Styles\Drawer.xaml
+Styles\Empty.xaml
Styles\Expander.xaml
Styles\FlipClock.xaml
Styles\FloatingBlock.xaml
diff --git a/src/Shared/HandyControl_Shared/Themes/Theme_GE45.txt b/src/Shared/HandyControl_Shared/Themes/Theme_GE45.txt
index 2ed7671c..9e629efc 100644
--- a/src/Shared/HandyControl_Shared/Themes/Theme_GE45.txt
+++ b/src/Shared/HandyControl_Shared/Themes/Theme_GE45.txt
@@ -82,6 +82,7 @@ Styles\Base\DateTimePickerBaseStyle.xaml
Styles\Base\DialogBaseStyle.xaml
Styles\Base\DividerBaseStyle.xaml
Styles\Base\DrawerBaseStyle.xaml
+Styles\Base\EmptyBaseStyle.xaml
Styles\Base\ExpanderBaseStyle.xaml
Styles\Base\FlowDocumentBaseStyle.xaml
Styles\Base\FrameBaseStyle.xaml
@@ -134,6 +135,7 @@ Styles\DateTimePicker.xaml
Styles\Dialog.xaml
Styles\Divider.xaml
Styles\Drawer.xaml
+Styles\Empty.xaml
Styles\Expander.xaml
Styles\FlipClock.xaml
Styles\FloatingBlock.xaml
From ff70553244601bee5a0862ca53deff774184436b Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Sun, 17 Jan 2021 23:28:45 +0800
Subject: [PATCH 13/15] update ComboBox Style with Empty control
---
.../Themes/Styles/Base/ComboBoxBaseStyle.xaml | 308 ++++++++--------
.../HandyControl_Net_40/Themes/Theme.xaml | 314 ++++++++---------
.../Themes/Styles/Base/ComboBoxBaseStyle.xaml | 308 ++++++++--------
.../HandyControl_Shared/Themes/Theme.xaml | 332 ++++++++----------
4 files changed, 577 insertions(+), 685 deletions(-)
diff --git a/src/Net_40/HandyControl_Net_40/Themes/Styles/Base/ComboBoxBaseStyle.xaml b/src/Net_40/HandyControl_Net_40/Themes/Styles/Base/ComboBoxBaseStyle.xaml
index 90e32bcf..e64263e5 100644
--- a/src/Net_40/HandyControl_Net_40/Themes/Styles/Base/ComboBoxBaseStyle.xaml
+++ b/src/Net_40/HandyControl_Net_40/Themes/Styles/Base/ComboBoxBaseStyle.xaml
@@ -82,14 +82,16 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -109,10 +111,6 @@
-
-
-
-
@@ -149,14 +147,16 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -176,10 +176,6 @@
-
-
-
-
@@ -214,14 +210,16 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -241,10 +239,6 @@
-
-
-
-
@@ -293,14 +287,16 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -320,10 +316,6 @@
-
-
-
-
@@ -360,14 +352,16 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -387,10 +381,6 @@
-
-
-
-
@@ -425,14 +415,16 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -452,10 +444,6 @@
-
-
-
-
@@ -599,14 +587,16 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -628,10 +618,6 @@
-
-
-
-
@@ -704,14 +690,16 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -733,10 +721,6 @@
-
-
-
-
@@ -812,14 +796,16 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -841,10 +827,6 @@
-
-
-
-
@@ -937,26 +919,30 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -983,14 +969,6 @@
-
-
-
-
-
-
-
-
@@ -1081,14 +1059,16 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -1110,10 +1090,6 @@
-
-
-
-
@@ -1203,26 +1179,30 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -1249,14 +1229,6 @@
-
-
-
-
-
-
-
-
diff --git a/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml b/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
index cbbcab06..fd655cf3 100644
--- a/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
+++ b/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
@@ -4514,14 +4514,16 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -4541,10 +4543,6 @@
-
-
-
-
@@ -4579,14 +4577,16 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -4606,10 +4606,6 @@
-
-
-
-
@@ -4642,14 +4638,16 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -4669,10 +4667,6 @@
-
-
-
-
@@ -4717,14 +4711,16 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -4744,10 +4740,6 @@
-
-
-
-
@@ -4782,14 +4774,16 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -4809,10 +4803,6 @@
-
-
-
-
@@ -4845,14 +4835,16 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -4872,10 +4864,6 @@
-
-
-
-
@@ -5011,14 +4999,16 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -5040,10 +5030,6 @@
-
-
-
-
@@ -5114,14 +5100,16 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -5143,10 +5131,6 @@
-
-
-
-
@@ -5220,14 +5204,16 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -5249,10 +5235,6 @@
-
-
-
-
@@ -5344,26 +5326,30 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -5390,14 +5376,6 @@
-
-
-
-
-
-
-
-
@@ -5486,14 +5464,16 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -5515,10 +5495,6 @@
-
-
-
-
@@ -5607,26 +5583,30 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -5653,14 +5633,6 @@
-
-
-
-
-
-
-
-
@@ -8219,9 +8191,9 @@
-
+
-
+
@@ -11102,7 +11074,7 @@
-
+
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/ComboBoxBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ComboBoxBaseStyle.xaml
index ee309422..81a2d478 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/ComboBoxBaseStyle.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ComboBoxBaseStyle.xaml
@@ -82,14 +82,16 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -116,10 +118,6 @@
-
-
-
-
@@ -156,14 +154,16 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -190,10 +190,6 @@
-
-
-
-
@@ -228,14 +224,16 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -262,10 +260,6 @@
-
-
-
-
@@ -314,14 +308,16 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -348,10 +344,6 @@
-
-
-
-
@@ -388,14 +380,16 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -422,10 +416,6 @@
-
-
-
-
@@ -460,14 +450,16 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -494,10 +486,6 @@
-
-
-
-
@@ -641,14 +629,16 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -677,10 +667,6 @@
-
-
-
-
@@ -753,14 +739,16 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -789,10 +777,6 @@
-
-
-
-
@@ -868,14 +852,16 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -904,10 +890,6 @@
-
-
-
-
@@ -1000,26 +982,30 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -1053,14 +1039,6 @@
-
-
-
-
-
-
-
-
@@ -1151,14 +1129,16 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -1187,10 +1167,6 @@
-
-
-
-
@@ -1280,26 +1256,30 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -1333,14 +1313,6 @@
-
-
-
-
-
-
-
-
diff --git a/src/Shared/HandyControl_Shared/Themes/Theme.xaml b/src/Shared/HandyControl_Shared/Themes/Theme.xaml
index f333bda3..88df14ed 100644
--- a/src/Shared/HandyControl_Shared/Themes/Theme.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Theme.xaml
@@ -4513,14 +4513,16 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -4547,10 +4549,6 @@
-
-
-
-
@@ -4585,14 +4583,16 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -4619,10 +4619,6 @@
-
-
-
-
@@ -4655,14 +4651,16 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -4689,10 +4687,6 @@
-
-
-
-
@@ -4737,14 +4731,16 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -4771,10 +4767,6 @@
-
-
-
-
@@ -4809,14 +4801,16 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -4843,10 +4837,6 @@
-
-
-
-
@@ -4879,14 +4869,16 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -4913,10 +4905,6 @@
-
-
-
-
@@ -5052,14 +5040,16 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -5088,10 +5078,6 @@
-
-
-
-
@@ -5162,14 +5148,16 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -5198,10 +5186,6 @@
-
-
-
-
@@ -5275,14 +5259,16 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -5311,10 +5297,6 @@
-
-
-
-
@@ -5406,26 +5388,30 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -5459,14 +5445,6 @@
-
-
-
-
-
-
-
-
@@ -5555,14 +5533,16 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -5591,10 +5571,6 @@
-
-
-
-
@@ -5683,26 +5659,30 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -5736,14 +5716,6 @@
-
-
-
-
-
-
-
-
@@ -12095,23 +12067,27 @@
-
+
-
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
From ceadde0984ef23b8341e1be630247938dee91b1d Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Tue, 19 Jan 2021 00:20:49 +0800
Subject: [PATCH 14/15] update ListView Style with Empty control
---
.../Themes/Styles/ListView.xaml | 44 ++++++++----------
.../HandyControl_Net_40/Themes/Theme.xaml | 45 ++++++++-----------
.../Themes/Styles/ListView.xaml | 43 +++++++-----------
.../HandyControl_Shared/Themes/Theme.xaml | 41 +++++++----------
4 files changed, 69 insertions(+), 104 deletions(-)
diff --git a/src/Net_40/HandyControl_Net_40/Themes/Styles/ListView.xaml b/src/Net_40/HandyControl_Net_40/Themes/Styles/ListView.xaml
index 2c9d8dde..195d2519 100644
--- a/src/Net_40/HandyControl_Net_40/Themes/Styles/ListView.xaml
+++ b/src/Net_40/HandyControl_Net_40/Themes/Styles/ListView.xaml
@@ -1,5 +1,6 @@
@@ -35,15 +36,7 @@
-
-
-
-
-
-
-
-
-
+
@@ -165,13 +150,20 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
-
\ No newline at end of file
+
diff --git a/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml b/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
index fd655cf3..31109d94 100644
--- a/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
+++ b/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
@@ -5343,7 +5343,7 @@
-
+
@@ -5600,7 +5600,7 @@
-
+
@@ -11850,15 +11850,7 @@
-
-
-
-
-
-
-
-
-
+
@@ -11977,9 +11961,16 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/ListView.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/ListView.xaml
index 8d35706c..2963986d 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/ListView.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/ListView.xaml
@@ -36,15 +36,7 @@
-
-
-
-
-
-
-
-
-
+
@@ -166,9 +150,16 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -184,4 +175,4 @@
-
\ No newline at end of file
+
diff --git a/src/Shared/HandyControl_Shared/Themes/Theme.xaml b/src/Shared/HandyControl_Shared/Themes/Theme.xaml
index 88df14ed..43eacdfc 100644
--- a/src/Shared/HandyControl_Shared/Themes/Theme.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Theme.xaml
@@ -11991,15 +11991,7 @@
-
-
-
-
-
-
-
-
-
+
@@ -12118,9 +12102,16 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
From 9c7a61f681b9afa8ee1f9445ce52fdf5cfbaeb45 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Tue, 19 Jan 2021 18:30:35 +0800
Subject: [PATCH 15/15] update CheckComboBox Style with Empty control
---
.../Styles/Base/CheckComboBoxBaseStyle.xaml | 180 ++++++++--------
.../Themes/Styles/Base/ComboBoxBaseStyle.xaml | 24 +--
.../HandyControl_Net_40/Themes/Theme.xaml | 204 +++++++++---------
.../Styles/Base/CheckComboBoxBaseStyle.xaml | 180 ++++++++--------
.../Themes/Styles/Base/ComboBoxBaseStyle.xaml | 24 +--
.../HandyControl_Shared/Themes/Theme.xaml | 204 +++++++++---------
6 files changed, 388 insertions(+), 428 deletions(-)
diff --git a/src/Net_40/HandyControl_Net_40/Themes/Styles/Base/CheckComboBoxBaseStyle.xaml b/src/Net_40/HandyControl_Net_40/Themes/Styles/Base/CheckComboBoxBaseStyle.xaml
index 15a9927e..55458778 100644
--- a/src/Net_40/HandyControl_Net_40/Themes/Styles/Base/CheckComboBoxBaseStyle.xaml
+++ b/src/Net_40/HandyControl_Net_40/Themes/Styles/Base/CheckComboBoxBaseStyle.xaml
@@ -74,21 +74,23 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -104,10 +106,6 @@
-
-
-
-
@@ -165,21 +163,23 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -195,10 +195,6 @@
-
-
-
-
@@ -232,21 +228,23 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -262,10 +260,6 @@
-
-
-
-
@@ -323,21 +317,23 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -355,10 +351,6 @@
-
-
-
-
@@ -430,21 +422,23 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -462,10 +456,6 @@
-
-
-
-
diff --git a/src/Net_40/HandyControl_Net_40/Themes/Styles/Base/ComboBoxBaseStyle.xaml b/src/Net_40/HandyControl_Net_40/Themes/Styles/Base/ComboBoxBaseStyle.xaml
index e64263e5..805422ab 100644
--- a/src/Net_40/HandyControl_Net_40/Themes/Styles/Base/ComboBoxBaseStyle.xaml
+++ b/src/Net_40/HandyControl_Net_40/Themes/Styles/Base/ComboBoxBaseStyle.xaml
@@ -85,7 +85,7 @@
-
+
@@ -150,7 +150,7 @@
-
+
@@ -213,7 +213,7 @@
-
+
@@ -290,7 +290,7 @@
-
+
@@ -355,7 +355,7 @@
-
+
@@ -418,7 +418,7 @@
-
+
@@ -590,7 +590,7 @@
-
+
@@ -693,7 +693,7 @@
-
+
@@ -799,7 +799,7 @@
-
+
@@ -922,7 +922,7 @@
-
+
@@ -1062,7 +1062,7 @@
-
+
@@ -1182,7 +1182,7 @@
-
+
diff --git a/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml b/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
index 31109d94..41ae9f10 100644
--- a/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
+++ b/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
@@ -4517,7 +4517,7 @@
-
+
@@ -4580,7 +4580,7 @@
-
+
@@ -4641,7 +4641,7 @@
-
+
@@ -4714,7 +4714,7 @@
-
+
@@ -4777,7 +4777,7 @@
-
+
@@ -4838,7 +4838,7 @@
-
+
@@ -5002,7 +5002,7 @@
-
+
@@ -5103,7 +5103,7 @@
-
+
@@ -5207,7 +5207,7 @@
-
+
@@ -5329,7 +5329,7 @@
-
+
@@ -5467,7 +5467,7 @@
-
+
@@ -5586,7 +5586,7 @@
-
+
@@ -6764,21 +6764,23 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -6794,10 +6796,6 @@
-
-
-
-
@@ -6853,21 +6851,23 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -6883,10 +6883,6 @@
-
-
-
-
@@ -6919,21 +6915,23 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -6949,10 +6947,6 @@
-
-
-
-
@@ -7008,21 +7002,23 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -7040,10 +7036,6 @@
-
-
-
-
@@ -7114,21 +7106,23 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -7146,10 +7140,6 @@
-
-
-
-
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/CheckComboBoxBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/CheckComboBoxBaseStyle.xaml
index 1791e4d9..d54231ea 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/CheckComboBoxBaseStyle.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/CheckComboBoxBaseStyle.xaml
@@ -74,21 +74,23 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -111,10 +113,6 @@
-
-
-
-
@@ -172,21 +170,23 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -209,10 +209,6 @@
-
-
-
-
@@ -246,21 +242,23 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -283,10 +281,6 @@
-
-
-
-
@@ -344,21 +338,23 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -383,10 +379,6 @@
-
-
-
-
@@ -458,21 +450,23 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -497,10 +491,6 @@
-
-
-
-
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/ComboBoxBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ComboBoxBaseStyle.xaml
index 81a2d478..64b50da7 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/ComboBoxBaseStyle.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ComboBoxBaseStyle.xaml
@@ -85,7 +85,7 @@
-
+
@@ -157,7 +157,7 @@
-
+
@@ -227,7 +227,7 @@
-
+
@@ -311,7 +311,7 @@
-
+
@@ -383,7 +383,7 @@
-
+
@@ -453,7 +453,7 @@
-
+
@@ -632,7 +632,7 @@
-
+
@@ -742,7 +742,7 @@
-
+
@@ -855,7 +855,7 @@
-
+
@@ -985,7 +985,7 @@
-
+
@@ -1132,7 +1132,7 @@
-
+
@@ -1259,7 +1259,7 @@
-
+
diff --git a/src/Shared/HandyControl_Shared/Themes/Theme.xaml b/src/Shared/HandyControl_Shared/Themes/Theme.xaml
index 43eacdfc..d47a8346 100644
--- a/src/Shared/HandyControl_Shared/Themes/Theme.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Theme.xaml
@@ -4516,7 +4516,7 @@
-
+
@@ -4586,7 +4586,7 @@
-
+
@@ -4654,7 +4654,7 @@
-
+
@@ -4734,7 +4734,7 @@
-
+
@@ -4804,7 +4804,7 @@
-
+
@@ -4872,7 +4872,7 @@
-
+
@@ -5043,7 +5043,7 @@
-
+
@@ -5151,7 +5151,7 @@
-
+
@@ -5262,7 +5262,7 @@
-
+
@@ -5391,7 +5391,7 @@
-
+
@@ -5536,7 +5536,7 @@
-
+
@@ -5662,7 +5662,7 @@
-
+
@@ -6847,21 +6847,23 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -6884,10 +6886,6 @@
-
-
-
-
@@ -6943,21 +6941,23 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -6980,10 +6980,6 @@
-
-
-
-
@@ -7016,21 +7012,23 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -7053,10 +7051,6 @@
-
-
-
-
@@ -7112,21 +7106,23 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -7151,10 +7147,6 @@
-
-
-
-
@@ -7225,21 +7217,23 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -7264,10 +7258,6 @@
-
-
-
-