From e3d2098e3f40682e2dd5059c3aa1f9ebe43ca720 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Su=C3=A1rez?= <javiersuarezruiz@hotmail.com>
Date: Wed, 8 Feb 2023 11:52:15 +0100
Subject: [PATCH 1/6] Correctly set the Windows Slider ThumbImageSource

---
 .../Pages/Controls/SliderPage.xaml            |  2 +-
 .../Resources/Images/thumb_image.svg          |  3 +
 .../Handlers/Slider/SliderHandler.Windows.cs  | 14 ++-
 .../src/Platform/Windows/SliderExtensions.cs  | 37 +++++++-
 .../Slider/SliderHandlerTests.Windows.cs      | 86 ++++++++++++++++++-
 5 files changed, 136 insertions(+), 6 deletions(-)
 create mode 100644 src/Controls/samples/Controls.Sample/Resources/Images/thumb_image.svg

diff --git a/src/Controls/samples/Controls.Sample/Pages/Controls/SliderPage.xaml b/src/Controls/samples/Controls.Sample/Pages/Controls/SliderPage.xaml
index da079ceaa4b8..ad430682cfcf 100644
--- a/src/Controls/samples/Controls.Sample/Pages/Controls/SliderPage.xaml
+++ b/src/Controls/samples/Controls.Sample/Pages/Controls/SliderPage.xaml
@@ -44,7 +44,7 @@
             <Slider ThumbColor="Orange"/>
 
             <Label Text="ThumbImageSource=coffee.png" Style="{StaticResource Headline}"/>
-            <Slider x:Name="ImageSlider" ThumbImageSource="coffee.png" />
+            <Slider x:Name="ImageSlider" ThumbImageSource="thumb_image.png" />
             <Button Text="Toggle Image" Clicked="ToggleImageSource" />
 
             <Label Text="Custom Slider (Red MinimumTrackColor, Green MaximumTrackColor, Blue ThumbColor)" Style="{StaticResource Headline}"/>
diff --git a/src/Controls/samples/Controls.Sample/Resources/Images/thumb_image.svg b/src/Controls/samples/Controls.Sample/Resources/Images/thumb_image.svg
new file mode 100644
index 000000000000..800274a089d3
--- /dev/null
+++ b/src/Controls/samples/Controls.Sample/Resources/Images/thumb_image.svg
@@ -0,0 +1,3 @@
+<svg width="5" height="10" viewBox="0 0 5 10" fill="none" xmlns="http://www.w3.org/2000/svg">
+	<rect width="5" height="10" fill="gray" />
+</svg>
\ No newline at end of file
diff --git a/src/Core/src/Handlers/Slider/SliderHandler.Windows.cs b/src/Core/src/Handlers/Slider/SliderHandler.Windows.cs
index 104b8f903430..1e1fd8e5f2e1 100644
--- a/src/Core/src/Handlers/Slider/SliderHandler.Windows.cs
+++ b/src/Core/src/Handlers/Slider/SliderHandler.Windows.cs
@@ -1,4 +1,5 @@
 #nullable enable
+using Microsoft.Maui.Graphics;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Controls.Primitives;
@@ -8,6 +9,7 @@ namespace Microsoft.Maui.Handlers
 {
 	public partial class SliderHandler : ViewHandler<ISlider, Slider>
 	{
+		Size? _thumbSize;
 		PointerEventHandler? _pointerPressedHandler;
 		PointerEventHandler? _pointerReleasedHandler;
 
@@ -45,6 +47,8 @@ protected override void DisconnectHandler(Slider platformView)
 
 			_pointerPressedHandler = null;
 			_pointerReleasedHandler = null;
+
+			_thumbSize = null;
 		}
 
 		public static void MapMinimum(ISliderHandler handler, ISlider slider)
@@ -83,7 +87,7 @@ public static void MapThumbImageSource(ISliderHandler handler, ISlider slider)
 
 			if (handler?.PlatformView is MauiSlider mauiSlider)
 			{
-				mauiSlider.UpdateThumbImageSourceAsync(slider, provider).FireAndForget(handler);
+				mauiSlider.UpdateThumbImageSourceAsync(slider, provider, (handler as SliderHandler)?._thumbSize).FireAndForget(handler);
 			}
 		}
 
@@ -92,7 +96,13 @@ void OnPlatformViewLoaded(object sender, RoutedEventArgs e)
 			var platformView = sender as Slider;
 
 			if (platformView != null)
-				platformView.ValueChanged += OnPlatformValueChanged;
+			{
+				if (platformView.GetFirstDescendant<Thumb>() is Thumb thumb)
+					_thumbSize = new Size(thumb.Width, thumb.Height);
+
+				if (platformView != null)
+					platformView.ValueChanged += OnPlatformValueChanged;
+			}
 		}
 
 		void OnPlatformValueChanged(object? sender, RangeBaseValueChangedEventArgs e)
diff --git a/src/Core/src/Platform/Windows/SliderExtensions.cs b/src/Core/src/Platform/Windows/SliderExtensions.cs
index 356e748a2c89..7d96004dc961 100644
--- a/src/Core/src/Platform/Windows/SliderExtensions.cs
+++ b/src/Core/src/Platform/Windows/SliderExtensions.cs
@@ -1,7 +1,11 @@
 #nullable enable
 using System;
 using System.Threading.Tasks;
+using Microsoft.Maui.Graphics;
+using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls.Primitives;
+using Microsoft.UI.Xaml.Media.Imaging;
 
 namespace Microsoft.Maui.Platform
 {
@@ -99,13 +103,20 @@ public static void UpdateThumbColor(this Slider platformSlider, ISlider slider)
 			"SliderThumbBackgroundDisabled",
 		};
 
-		internal static async Task UpdateThumbImageSourceAsync(this MauiSlider nativeSlider, ISlider slider, IImageSourceServiceProvider? provider)
+		internal static async Task UpdateThumbImageSourceAsync(this MauiSlider nativeSlider, ISlider slider, IImageSourceServiceProvider? provider, Size? defaultThumbSize)
 		{
 			var thumbImageSource = slider.ThumbImageSource;
 
 			if (thumbImageSource == null)
 			{
 				nativeSlider.ThumbImageSource = null;
+
+				if (defaultThumbSize.HasValue && nativeSlider.GetFirstDescendant<Thumb>() is Thumb thumb)
+				{
+					thumb.Height = defaultThumbSize.Value.Height;
+					thumb.Width = defaultThumbSize.Value.Width;
+				}
+
 				return;
 			}
 
@@ -113,7 +124,29 @@ internal static async Task UpdateThumbImageSourceAsync(this MauiSlider nativeSli
 			{
 				var service = provider.GetRequiredImageSourceService(thumbImageSource);
 				var nativeThumbImageSource = await service.GetImageSourceAsync(thumbImageSource);
-
+				var nativeThumbImage = nativeThumbImageSource?.Value;
+
+				// BitmapImage is a special case that has an event when the image is loaded
+				// when this happens, we want to resize the thumb
+				if (nativeThumbImage is BitmapImage bitmapImage)
+				{
+					bitmapImage.ImageOpened += OnImageOpened;
+
+					void OnImageOpened(object sender, RoutedEventArgs e)
+					{
+						bitmapImage.ImageOpened -= OnImageOpened;
+
+						if (nativeSlider.GetFirstDescendant<Thumb>() is Thumb thumb)
+						{
+							thumb.Height = bitmapImage.PixelHeight;
+							thumb.Width = bitmapImage.PixelWidth;
+						}
+												
+						if (nativeSlider.Parent is FrameworkElement frameworkElement)
+							frameworkElement.InvalidateMeasure();
+					};
+				}
+			
 				nativeSlider.ThumbImageSource = nativeThumbImageSource?.Value;
 			}
 		}
diff --git a/src/Core/tests/DeviceTests/Handlers/Slider/SliderHandlerTests.Windows.cs b/src/Core/tests/DeviceTests/Handlers/Slider/SliderHandlerTests.Windows.cs
index 2def3b26c5c0..6bec135bea96 100644
--- a/src/Core/tests/DeviceTests/Handlers/Slider/SliderHandlerTests.Windows.cs
+++ b/src/Core/tests/DeviceTests/Handlers/Slider/SliderHandlerTests.Windows.cs
@@ -1,6 +1,7 @@
 using System.Threading.Tasks;
 using Microsoft.Maui.DeviceTests.Stubs;
 using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls.Primitives;
 using Xunit;
 
 namespace Microsoft.Maui.DeviceTests
@@ -35,6 +36,69 @@ public async Task SmallChangeInitializesCorrectly(double min, double max, double
 			Assert.True(expected != 0);
 		}
 
+		[Fact]
+		public async Task ThumbImageSourceUpdatesCorrectly()
+		{
+			var slider = new SliderStub
+			{
+				Maximum = 10,
+				Minimum = 0,
+				Value = 5,
+				ThumbImageSource = new FileImageSourceStub("black.png"),
+			};
+
+			// Update the Slider ThumbImageSource
+			slider.ThumbImageSource = new FileImageSourceStub("red.png");
+
+			await InvokeOnMainThreadAsync(async () =>
+			{
+				var handler = CreateHandler(slider);
+
+				bool imageLoaded = await Wait(() => ImageSourceLoaded(handler));
+
+				Assert.True(imageLoaded);
+				
+				await Task.Delay(100);
+
+				var expectedColor = Color.FromArgb("#FF0000");
+				await handler.PlatformView.AssertContainsColor(expectedColor);
+			});
+		}
+
+		[Theory]
+		[InlineData("red.png", 100, 100)]
+		[InlineData("black.png", 100, 100)]
+		public async Task ThumbImageSourceSizeIsCorrect(string filename, double thumbHeight, double thumbWidth)
+		{
+			var slider = new SliderStub
+			{
+				Maximum = 10,
+				Minimum = 0,
+				Value = 5,
+				ThumbImageSource = new FileImageSourceStub("black.png"),
+			};
+
+			await InvokeOnMainThreadAsync(async () =>
+			{
+				var handler = CreateHandler(slider);
+
+				bool imageLoaded = await Wait(() => ImageSourceLoaded(handler));
+				Assert.True(imageLoaded);
+				
+				await handler.PlatformView.AttachAndRun(async () =>
+				{
+					// Update the Slider ThumbImageSource
+					slider.ThumbImageSource = new FileImageSourceStub(filename);
+
+					await Task.Delay(100);
+
+					var nativeThumbSize = GetNativeThumbSize(handler);
+					Assert.Equal(nativeThumbSize.Height, thumbHeight);
+					Assert.Equal(nativeThumbSize.Width, thumbWidth);
+				});
+			});
+		}
+
 		Slider GetNativeSlider(SliderHandler sliderHandler) =>
 			sliderHandler.PlatformView;
 
@@ -48,6 +112,26 @@ double GetNativeMaximum(SliderHandler sliderHandler) =>
 			GetNativeSlider(sliderHandler).Maximum;
 
 		double GetSmallChange(SliderHandler sliderHandler) =>
-		GetNativeSlider(sliderHandler).SmallChange;
+			GetNativeSlider(sliderHandler).SmallChange;
+
+		Size GetNativeThumbSize(SliderHandler sliderHandler)
+		{
+			var nativeSlider = GetNativeSlider(sliderHandler);
+			
+			if(nativeSlider.GetFirstDescendant<Thumb>() is Thumb thumb)
+			{
+				return new Size(thumb.Width, thumb.Height);
+			}
+
+			return Size.Zero;
+		}
+
+		bool ImageSourceLoaded(SliderHandler sliderHandler)
+		{
+			if (sliderHandler.PlatformView is MauiSlider mauiSlider)
+				return mauiSlider.ThumbImageSource != null;
+
+			return false;
+		}
 	}
 }
\ No newline at end of file

From b269f64824bbb11a9f9284228b8b917c99afdc71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Su=C3=A1rez?= <javiersuarezruiz@hotmail.com>
Date: Wed, 8 Feb 2023 17:52:46 +0100
Subject: [PATCH 2/6] Update
 src/Core/src/Handlers/Slider/SliderHandler.Windows.cs

Co-authored-by: Manuel de la Pena <mandel@microsoft.com>
---
 src/Core/src/Handlers/Slider/SliderHandler.Windows.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Core/src/Handlers/Slider/SliderHandler.Windows.cs b/src/Core/src/Handlers/Slider/SliderHandler.Windows.cs
index 1e1fd8e5f2e1..b87b614e559b 100644
--- a/src/Core/src/Handlers/Slider/SliderHandler.Windows.cs
+++ b/src/Core/src/Handlers/Slider/SliderHandler.Windows.cs
@@ -100,7 +100,7 @@ void OnPlatformViewLoaded(object sender, RoutedEventArgs e)
 				if (platformView.GetFirstDescendant<Thumb>() is Thumb thumb)
 					_thumbSize = new Size(thumb.Width, thumb.Height);
 
-				if (platformView != null)
+				if (platformView is not null)
 					platformView.ValueChanged += OnPlatformValueChanged;
 			}
 		}

From 70a5f135919a0c2bb26a43aa1446399d0e7f0bd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Su=C3=A1rez?= <javiersuarezruiz@hotmail.com>
Date: Wed, 8 Feb 2023 17:53:00 +0100
Subject: [PATCH 3/6] Update
 src/Core/tests/DeviceTests/Handlers/Slider/SliderHandlerTests.Windows.cs

Co-authored-by: Manuel de la Pena <mandel@microsoft.com>
---
 .../Handlers/Slider/SliderHandlerTests.Windows.cs            | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/Core/tests/DeviceTests/Handlers/Slider/SliderHandlerTests.Windows.cs b/src/Core/tests/DeviceTests/Handlers/Slider/SliderHandlerTests.Windows.cs
index 6bec135bea96..a79077fce128 100644
--- a/src/Core/tests/DeviceTests/Handlers/Slider/SliderHandlerTests.Windows.cs
+++ b/src/Core/tests/DeviceTests/Handlers/Slider/SliderHandlerTests.Windows.cs
@@ -128,10 +128,7 @@ Size GetNativeThumbSize(SliderHandler sliderHandler)
 
 		bool ImageSourceLoaded(SliderHandler sliderHandler)
 		{
-			if (sliderHandler.PlatformView is MauiSlider mauiSlider)
-				return mauiSlider.ThumbImageSource != null;
-
-			return false;
+           return (sliderHandler.PlatformView as MauiSlider)?.ThumbImageSource != null;
 		}
 	}
 }
\ No newline at end of file

From 0fd1260fafa33f9d5e8822912f1fbdb3d15f7f59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Su=C3=A1rez?= <javiersuarezruiz@hotmail.com>
Date: Wed, 8 Feb 2023 17:58:17 +0100
Subject: [PATCH 4/6] Updated sample

---
 .../samples/Controls.Sample/Pages/Controls/SliderPage.xaml      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Controls/samples/Controls.Sample/Pages/Controls/SliderPage.xaml b/src/Controls/samples/Controls.Sample/Pages/Controls/SliderPage.xaml
index ad430682cfcf..92054c1ea705 100644
--- a/src/Controls/samples/Controls.Sample/Pages/Controls/SliderPage.xaml
+++ b/src/Controls/samples/Controls.Sample/Pages/Controls/SliderPage.xaml
@@ -43,7 +43,7 @@
             <Label Text="ThumbColor=Orange" Style="{StaticResource Headline}"/>
             <Slider ThumbColor="Orange"/>
 
-            <Label Text="ThumbImageSource=coffee.png" Style="{StaticResource Headline}"/>
+            <Label Text="ThumbImageSource=thumb_image.png" Style="{StaticResource Headline}"/>
             <Slider x:Name="ImageSlider" ThumbImageSource="thumb_image.png" />
             <Button Text="Toggle Image" Clicked="ToggleImageSource" />
 

From 966fc7b9d9957ad5a93140061a5311895fd1fe29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Su=C3=A1rez?= <javiersuarezruiz@hotmail.com>
Date: Wed, 8 Feb 2023 18:05:16 +0100
Subject: [PATCH 5/6] Refactoring code

---
 src/Core/src/Handlers/Slider/SliderHandler.Windows.cs | 9 +++++----
 src/Core/src/Platform/Windows/SliderExtensions.cs     | 4 +++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/Core/src/Handlers/Slider/SliderHandler.Windows.cs b/src/Core/src/Handlers/Slider/SliderHandler.Windows.cs
index b87b614e559b..1468a86f97f8 100644
--- a/src/Core/src/Handlers/Slider/SliderHandler.Windows.cs
+++ b/src/Core/src/Handlers/Slider/SliderHandler.Windows.cs
@@ -95,13 +95,14 @@ void OnPlatformViewLoaded(object sender, RoutedEventArgs e)
 		{
 			var platformView = sender as Slider;
 
-			if (platformView != null)
+			if (platformView is not null)
 			{
-				if (platformView.GetFirstDescendant<Thumb>() is Thumb thumb)
+				var thumb = platformView.GetFirstDescendant<Thumb>();
+
+				if (thumb is not null)
 					_thumbSize = new Size(thumb.Width, thumb.Height);
 
-				if (platformView is not null)
-					platformView.ValueChanged += OnPlatformValueChanged;
+				platformView.ValueChanged += OnPlatformValueChanged;
 			}
 		}
 
diff --git a/src/Core/src/Platform/Windows/SliderExtensions.cs b/src/Core/src/Platform/Windows/SliderExtensions.cs
index 7d96004dc961..9e9f4ca18add 100644
--- a/src/Core/src/Platform/Windows/SliderExtensions.cs
+++ b/src/Core/src/Platform/Windows/SliderExtensions.cs
@@ -111,7 +111,9 @@ internal static async Task UpdateThumbImageSourceAsync(this MauiSlider nativeSli
 			{
 				nativeSlider.ThumbImageSource = null;
 
-				if (defaultThumbSize.HasValue && nativeSlider.GetFirstDescendant<Thumb>() is Thumb thumb)
+				var thumb = nativeSlider.GetFirstDescendant<Thumb>();
+
+				if (defaultThumbSize.HasValue && thumb is not null)
 				{
 					thumb.Height = defaultThumbSize.Value.Height;
 					thumb.Width = defaultThumbSize.Value.Width;

From dc3cbe303997f08f12b88814de14be167c3b6d8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Su=C3=A1rez?= <javiersuarezruiz@hotmail.com>
Date: Fri, 10 Feb 2023 09:41:45 +0100
Subject: [PATCH 6/6] Refactoring code

---
 src/Core/src/Platform/Windows/SliderExtensions.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Core/src/Platform/Windows/SliderExtensions.cs b/src/Core/src/Platform/Windows/SliderExtensions.cs
index 9e9f4ca18add..d9922b323978 100644
--- a/src/Core/src/Platform/Windows/SliderExtensions.cs
+++ b/src/Core/src/Platform/Windows/SliderExtensions.cs
@@ -138,7 +138,7 @@ void OnImageOpened(object sender, RoutedEventArgs e)
 					{
 						bitmapImage.ImageOpened -= OnImageOpened;
 
-						if (nativeSlider.GetFirstDescendant<Thumb>() is Thumb thumb)
+						if (nativeSlider.TryGetFirstDescendant<Thumb>(out var thumb))
 						{
 							thumb.Height = bitmapImage.PixelHeight;
 							thumb.Width = bitmapImage.PixelWidth;