From 378af385e4fa7f725ea3011c9e92a54c07924e60 Mon Sep 17 00:00:00 2001 From: NaBian <836904362@qq.com> Date: Sun, 31 Jan 2021 23:42:40 +0800 Subject: [PATCH] add ShowEmpty prop for Empty control --- src/Net_40/HandyControl_Net_40/Themes/Theme.xaml | 1 + src/Shared/HandyControl_Shared/Controls/Other/Empty.cs | 10 ++++++++++ .../Themes/Styles/Base/EmptyBaseStyle.xaml | 8 +++++++- src/Shared/HandyControl_Shared/Themes/Theme.xaml | 1 + 4 files changed, 19 insertions(+), 1 deletion(-) diff --git a/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml b/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml index 62053b01..1e573d22 100644 --- a/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml +++ b/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml @@ -8232,6 +8232,7 @@ + diff --git a/src/Shared/HandyControl_Shared/Controls/Other/Empty.cs b/src/Shared/HandyControl_Shared/Controls/Other/Empty.cs index 4fb03460..459a6cc0 100644 --- a/src/Shared/HandyControl_Shared/Controls/Other/Empty.cs +++ b/src/Shared/HandyControl_Shared/Controls/Other/Empty.cs @@ -1,5 +1,6 @@ using System.Windows; using System.Windows.Controls; +using HandyControl.Data; namespace HandyControl.Controls { @@ -22,5 +23,14 @@ namespace HandyControl.Controls get => GetValue(LogoProperty); set => SetValue(LogoProperty, value); } + + public static readonly DependencyProperty ShowEmptyProperty = DependencyProperty.RegisterAttached( + "ShowEmpty", typeof(bool), typeof(Empty), new FrameworkPropertyMetadata(ValueBoxes.FalseBox, FrameworkPropertyMetadataOptions.Inherits)); + + public static void SetShowEmpty(DependencyObject element, bool value) + => element.SetValue(ShowEmptyProperty, value); + + public static bool GetShowEmpty(DependencyObject element) + => (bool) element.GetValue(ShowEmptyProperty); } } diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/EmptyBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/EmptyBaseStyle.xaml index fb9aa95a..8fc8f959 100644 --- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/EmptyBaseStyle.xaml +++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/EmptyBaseStyle.xaml @@ -3,7 +3,12 @@ xmlns:langs="clr-namespace:HandyControl.Properties.Langs" xmlns:ex="clr-namespace:HandyControl.Tools.Extension" xmlns:o="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options" - xmlns:hc="clr-namespace:HandyControl.Controls"> + xmlns:hc="clr-namespace:HandyControl.Controls" + xmlns:themes="clr-namespace:HandyControl.Themes"> + + + + @@ -24,6 +29,7 @@ + diff --git a/src/Shared/HandyControl_Shared/Themes/Theme.xaml b/src/Shared/HandyControl_Shared/Themes/Theme.xaml index 79767e8a..811ef7b1 100644 --- a/src/Shared/HandyControl_Shared/Themes/Theme.xaml +++ b/src/Shared/HandyControl_Shared/Themes/Theme.xaml @@ -8350,6 +8350,7 @@ +