chore: wip

unoplatform · Aug 24, 2023 · 44e1ba3 · 44e1ba3
1 parent f633ff0
commit 44e1ba3
Show file tree

Hide file tree

Showing 8 changed files with 449 additions and 479 deletions.
diff --git a/....Samples/Uno.Toolkit.Samples.Shared/Content/Controls/ShadowContainerSamplePage.WinUI.xaml b/....Samples/Uno.Toolkit.Samples.Shared/Content/Controls/ShadowContainerSamplePage.WinUI.xaml
diff --git a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Converters/HexToColorConverter.cs b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Converters/HexToColorConverter.cs
@@ -16,7 +16,7 @@ public class HexToColorConverter : IValueConverter
 	{
 		public object Convert(object value, Type targetType, object parameter, string language)
 		{
-			return value.ToString();
+			return value?.ToString();
 		}
 
 		public object ConvertBack(object value, Type targetType, object parameter, string language)

diff --git a/src/Uno.Toolkit.Skia.WinUI/Controls/Shadows/Shadow.cs b/src/Uno.Toolkit.Skia.WinUI/Controls/Shadows/Shadow.cs
@@ -148,16 +148,6 @@ public double Spread
 
 	public event PropertyChangedEventHandler? PropertyChanged;
 
-	internal static bool IsShadowProperty(string propertyName)
-	{
-		return propertyName == nameof(OffsetX) || propertyName == nameof(OffsetY) ||
-			   propertyName == nameof(IsInner) ||
-			   propertyName == nameof(Color) ||
-			   propertyName == nameof(Opacity) ||
-			   propertyName == nameof(BlurRadius) ||
-			   propertyName == nameof(Spread);
-	}
-
 	internal static bool IsShadowSizeProperty(string propertyName)
 	{
 		return propertyName == nameof(OffsetX) || propertyName == nameof(OffsetY) ||
@@ -174,9 +164,6 @@ private static void OnPropertyChanged(object dependencyObject, string propertyNa
 	public override string ToString() =>
 		$"{{ IsInner: {{{IsInner}}}, Offset: {{{OffsetX}, {OffsetY}}} Color: {{A={Color.A}, R={Color.R}, G={Color.G}, B={Color.B}}}, Opacity: {Opacity}, BlurRadius: {BlurRadius}, Spread: {Spread} }}";
 
-	public string ToKey() =>
-		string.Join(",", IsInner, OffsetX, OffsetY, Color.ToString(), Opacity, BlurRadius, Spread);
-
 	public Shadow Clone()
 	{
 		return new Shadow

diff --git a/src/Uno.Toolkit.Skia.WinUI/Controls/Shadows/ShadowCollection.cs b/src/Uno.Toolkit.Skia.WinUI/Controls/Shadows/ShadowCollection.cs
@@ -6,5 +6,4 @@ namespace Uno.Toolkit.UI;
 
 public class ShadowCollection : ObservableCollection<Shadow>
 {
-	public string ToKey() => string.Join("/", this.Select(x => x.ToKey()));
 }