From 4729cbfdab60c3cd27694e2703e029d6b33642b0 Mon Sep 17 00:00:00 2001 From: ZX Date: Tue, 16 Apr 2019 16:29:55 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0Null2VisibilityConverter?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit value是null的时候隐藏，不为null显示 --- HandyControl/HandyControl.csproj | 1 + HandyControl/Themes/Basic/Converters.xaml | 1 + .../Converter/Null2VisibilityConverter.cs | 20 +++++++++++++++++++ 3 files changed, 22 insertions(+) create mode 100644 HandyControl/Tools/Converter/Null2VisibilityConverter.cs diff --git a/HandyControl/HandyControl.csproj b/HandyControl/HandyControl.csproj index df53b761..f6c8d4ef 100644 --- a/HandyControl/HandyControl.csproj +++ b/HandyControl/HandyControl.csproj @@ -156,6 +156,7 @@ + diff --git a/HandyControl/Themes/Basic/Converters.xaml b/HandyControl/Themes/Basic/Converters.xaml index 8a4d418f..1246361f 100644 --- a/HandyControl/Themes/Basic/Converters.xaml +++ b/HandyControl/Themes/Basic/Converters.xaml @@ -15,5 +15,6 @@ + \ No newline at end of file diff --git a/HandyControl/Tools/Converter/Null2VisibilityConverter.cs b/HandyControl/Tools/Converter/Null2VisibilityConverter.cs new file mode 100644 index 00000000..d1edc482 --- /dev/null +++ b/HandyControl/Tools/Converter/Null2VisibilityConverter.cs @@ -0,0 +1,20 @@ +using System; +using System.Globalization; +using System.Windows; +using System.Windows.Data; + +namespace HandyControl.Tools.Converter +{ + public class Null2VisibilityConverter : IValueConverter + { + public object Convert(object value, Type targetType, object parameter, CultureInfo culture) + { + return value == null ? Visibility.Collapsed : Visibility.Visible; + } + + public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) + { + throw new NotImplementedException(); + } + } +} From 2f5c21fc625eb0e086121387237e0fb52a1302d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=9C=BE=E5=B0=8B?= Date: Wed, 17 Apr 2019 00:04:43 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86Null2VisibilityC?= =?UTF-8?q?onverter=E8=BD=AC=E6=8D=A2=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit value是Null的时候隐藏，不为Null时显示 --- .../HandyControl_Shared.projitems | 1 + .../Themes/Basic/Converters.xaml | 1 + .../Converter/Null2VisibilityConverter.cs | 20 +++++++++++++++++++ 3 files changed, 22 insertions(+) create mode 100644 src/Shared/HandyControl_Shared/Tools/Converter/Null2VisibilityConverter.cs diff --git a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems index c14ba4cd..5ac2d019 100644 --- a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems +++ b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems @@ -209,6 +209,7 @@ + diff --git a/src/Shared/HandyControl_Shared/Themes/Basic/Converters.xaml b/src/Shared/HandyControl_Shared/Themes/Basic/Converters.xaml index 2de6c240..d883342d 100644 --- a/src/Shared/HandyControl_Shared/Themes/Basic/Converters.xaml +++ b/src/Shared/HandyControl_Shared/Themes/Basic/Converters.xaml @@ -16,5 +16,6 @@ + \ No newline at end of file diff --git a/src/Shared/HandyControl_Shared/Tools/Converter/Null2VisibilityConverter.cs b/src/Shared/HandyControl_Shared/Tools/Converter/Null2VisibilityConverter.cs new file mode 100644 index 00000000..d1edc482 --- /dev/null +++ b/src/Shared/HandyControl_Shared/Tools/Converter/Null2VisibilityConverter.cs @@ -0,0 +1,20 @@ +using System; +using System.Globalization; +using System.Windows; +using System.Windows.Data; + +namespace HandyControl.Tools.Converter +{ + public class Null2VisibilityConverter : IValueConverter + { + public object Convert(object value, Type targetType, object parameter, CultureInfo culture) + { + return value == null ? Visibility.Collapsed : Visibility.Visible; + } + + public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) + { + throw new NotImplementedException(); + } + } +} From 62c6528f35dfdb8e4a514f8f5aa4cd357ad448ca Mon Sep 17 00:00:00 2001 From: NaBian <836904362@qq.com> Date: Wed, 17 Apr 2019 19:47:19 +0800 Subject: [PATCH 3/3] change the class name --- src/Shared/HandyControl_Shared/HandyControl_Shared.projitems | 2 +- src/Shared/HandyControl_Shared/Themes/Basic/Converters.xaml | 2 +- ...ull2VisibilityConverter.cs => Object2VisibilityConverter.cs} | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename src/Shared/HandyControl_Shared/Tools/Converter/{Null2VisibilityConverter.cs => Object2VisibilityConverter.cs} (89%) diff --git a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems index 5ac2d019..a382e54c 100644 --- a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems +++ b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems @@ -209,7 +209,7 @@ - + diff --git a/src/Shared/HandyControl_Shared/Themes/Basic/Converters.xaml b/src/Shared/HandyControl_Shared/Themes/Basic/Converters.xaml index d883342d..68e208ca 100644 --- a/src/Shared/HandyControl_Shared/Themes/Basic/Converters.xaml +++ b/src/Shared/HandyControl_Shared/Themes/Basic/Converters.xaml @@ -16,6 +16,6 @@ - + \ No newline at end of file diff --git a/src/Shared/HandyControl_Shared/Tools/Converter/Null2VisibilityConverter.cs b/src/Shared/HandyControl_Shared/Tools/Converter/Object2VisibilityConverter.cs similarity index 89% rename from src/Shared/HandyControl_Shared/Tools/Converter/Null2VisibilityConverter.cs rename to src/Shared/HandyControl_Shared/Tools/Converter/Object2VisibilityConverter.cs index d1edc482..ba99d2e8 100644 --- a/src/Shared/HandyControl_Shared/Tools/Converter/Null2VisibilityConverter.cs +++ b/src/Shared/HandyControl_Shared/Tools/Converter/Object2VisibilityConverter.cs @@ -5,7 +5,7 @@ using System.Windows.Data; namespace HandyControl.Tools.Converter { - public class Null2VisibilityConverter : IValueConverter + public class Object2VisibilityConverter : IValueConverter { public object Convert(object value, Type targetType, object parameter, CultureInfo culture) {