Revert "fix(shadows): background theming issue"

unoplatform · Aug 23, 2023 · 4e462a1 · 4e462a1
1 parent 5199415
commit 4e462a1
Show file tree

Hide file tree

Showing 7 changed files with 352 additions and 233 deletions.
diff --git a/src/Uno.Toolkit.Skia.WinUI/Controls/Shadows/Shadow.cs b/src/Uno.Toolkit.Skia.WinUI/Controls/Shadows/Shadow.cs
@@ -1,5 +1,11 @@
 using System.ComponentModel;
+
+#if IS_WINUI
 using Microsoft.UI.Xaml;
+#else
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+#endif
 
 namespace Uno.Toolkit.UI;
 

diff --git a/src/Uno.Toolkit.Skia.WinUI/Controls/Shadows/ShadowCollection.cs b/src/Uno.Toolkit.Skia.WinUI/Controls/Shadows/ShadowCollection.cs
@@ -1,8 +1,15 @@
-using System;
-using System.Collections.ObjectModel;
+using System.Collections.ObjectModel;
 using System.Globalization;
 using System.Linq;
 
 namespace Uno.Toolkit.UI;
 
-public class ShadowCollection : ObservableCollection<Shadow> { }
+public class ShadowCollection : ObservableCollection<Shadow>
+{
+	public bool HasInnerShadow() => this.Any(s => s.IsInner);
+
+	public string ToKey(double width, double height, Windows.UI.Color? contentBackground)
+		=> string.Create(CultureInfo.InvariantCulture, $"w{width},h{height}") +
+		(contentBackground.HasValue ? $",cb{contentBackground.Value}:" : ":") +
+		string.Join("/", this.Select(x => x.ToKey()));
+}