chore(ShadowContainer): refactored shadows size disposable after review

unoplatform · Sep 25, 2023 · b359de7 · b359de7
1 parent 83e5693
commit b359de7
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 33 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
@@ -310,7 +310,7 @@
 							<StackPanel Spacing="8">
 								<TextBlock Text="Complex Shadow Shapes" Style="{StaticResource TitleTextBlockStyle}" />
 
-										<!--
+								<!--
 									Should be the same as: https://developer.mozilla.org/fr/docs/Web/CSS/CSS_backgrounds_and_borders/Box-shadow_generator
 									element {
 									width: 300px;	height: 100px;	background-color: #7A67F8;	position: relative;
@@ -323,26 +323,26 @@
 								<utu:ShadowContainer Margin="0,30" Background="{StaticResource UnoColor}">
 									<utu:ShadowContainer.Shadows>
 										<utu:ShadowCollection>
-											<utu:Shadow BlurRadius="10"
-														IsInner="True"
+											<utu:Shadow IsInner="True"
 														OffsetX="-20"
 														OffsetY="-10"
-														Opacity="1"
+														BlurRadius="10"
 														Spread="10"
-														Color="Black" />
-											<utu:Shadow BlurRadius="5"
-														IsInner="True"
+														Color="Black"
+														Opacity="1" />
+											<utu:Shadow IsInner="True"
 														OffsetX="5"
 														OffsetY="-5"
-														Opacity="1"
+														BlurRadius="5"
 														Spread="0"
-														Color="#94DB6D" />
-											<utu:Shadow BlurRadius="5"
-														OffsetX="6"
+														Color="#94DB6D"
+														Opacity="1" />
+											<utu:Shadow OffsetX="6"
 														OffsetY="-5"
-														Opacity="1"
+														BlurRadius="5"
 														Spread="0"
-														Color="#E88BAB" />
+														Color="#E88BAB"
+														Opacity="1" />
 										</utu:ShadowCollection>
 									</utu:ShadowContainer.Shadows>
 									<Button Width="300"

diff --git a/src/Uno.Toolkit.Skia.WinUI/Controls/Shadows/ShadowContainer.cs b/src/Uno.Toolkit.Skia.WinUI/Controls/Shadows/ShadowContainer.cs
@@ -33,8 +33,6 @@ public partial class ShadowContainer : ContentControl
 
 	private readonly SerialDisposable _eventSubscriptions = new();
 
-	private readonly SerialDisposable _shadowHostSubscriptions = new();
-
 	private Grid? _panel;
 	private Canvas? _canvas;
 
@@ -77,6 +75,8 @@ private void BindToPaintingProperties()
 			this.RegisterDisposablePropertyChangedCallback(ShadowsProperty, OnShadowsChanged),
 			this.RegisterDisposablePropertyChangedCallback(ContentProperty, OnContentChanged),
 
+			RegisterDisposableShadowHostSizeChangedCallback(OnShadowHostSizeChanged),
+
 			backgroundNestedDisposable,
 			shadowsNestedDisposable,
 			contentNestedDisposable,
@@ -90,7 +90,7 @@ private void BindToPaintingProperties()
 		// This method should not fire any of InvalidateXyz-methods directly,
 		// in order to avoid duplicated invalidate calls.
 		// Which is why the BindToXyz has been separated from the OnXyzChanged.
-
+		
 		void OnBackgroundChanged(DependencyObject sender, DependencyProperty dp)
 		{
 			BindToBackgroundMemberProperties(Background);
@@ -110,6 +110,11 @@ void OnContentChanged(DependencyObject sender, DependencyProperty dp)
 
 			InvalidateShadows();
 		}
+		// When the skia canvas size changes, the whole canvas is cleared: we'll need to redraw the shadows.
+		void OnShadowHostSizeChanged(object sender, SizeChangedEventArgs args)
+		{
+			_isShadowHostDirty = true;
+		}
 
 		void OnShadowPropertyChanged(object? sender, PropertyChangedEventArgs e)
 		{
@@ -121,6 +126,7 @@ void OnShadowPropertyChanged(object? sender, PropertyChangedEventArgs e)
 			}
 			InvalidateShadows();
 		}
+
 		void OnInnerPropertyChanged(DependencyObject sender, DependencyProperty dp)
 		{
 			InvalidateShadows();
@@ -141,6 +147,21 @@ void OnContentSizeChanged(object sender, SizeChangedEventArgs e)
 			InvalidateShadows();
 		}
 
+		SerialDisposable RegisterDisposableShadowHostSizeChangedCallback(SizeChangedEventHandler sizeChanged)
+		{
+			if (_shadowHost == null)
+			{
+				return new SerialDisposable();
+			}
+
+			_shadowHost.SizeChanged += OnShadowHostSizeChanged;
+			return new SerialDisposable
+			{
+				Disposable = Disposable.Create(() => _shadowHost.SizeChanged -= sizeChanged),
+			};
+
+		}
+
 		void BindToBackgroundMemberProperties(Brush? background)
 		{
 			backgroundNestedDisposable.Disposable = background switch
@@ -257,25 +278,9 @@ protected override void OnApplyTemplate()
 
 		_shadowHost = skiaCanvas;
 		_canvas?.Children.Insert(0, _shadowHost!);
-
-		BindToShadowHost(_shadowHost);
 	}
 
-	private void BindToShadowHost(SKXamlCanvas skiaCanvas)
-	{
-		_shadowHostSubscriptions.Disposable?.Dispose();
-		skiaCanvas.SizeChanged += OnShadowHostSizeChanged;
-		_shadowHostSubscriptions.Disposable = new CompositeDisposable
-		{
-			Disposable.Create(() => skiaCanvas.SizeChanged -= OnShadowHostSizeChanged),
-		};
-
-		// When the skia canvas size changes, the whole canvas is cleared: we'll need to redraw the shadows.
-		void OnShadowHostSizeChanged(object sender, SizeChangedEventArgs args)
-		{
-			_isShadowHostDirty = true;
-		}
-	}
+
 
 	private void InvalidateCanvasLayout()
 	{