fix: Handle scaling less than 100% on Wasm

unoplatform · Aug 31, 2021 · 7937de6 · 7937de6
1 parent 63e9cde
commit 7937de6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_Image.cs b/src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_Image.cs
@@ -81,6 +81,7 @@ public async Task When_Resource_Has_Scale_Qualifier()
 		{
 			var scales = new List<ResolutionScale>()
 			{
+				(ResolutionScale)80,
 				ResolutionScale.Scale100Percent,
 				ResolutionScale.Scale150Percent,
 				ResolutionScale.Scale200Percent,

diff --git a/src/Uno.UI/UI/Xaml/Media/Imaging/BitmapImage.wasm.cs b/src/Uno.UI/UI/Xaml/Media/Imaging/BitmapImage.wasm.cs
@@ -126,6 +126,14 @@ private static string GetScaledPath(string path, HashSet<string> assets, Resolut
 
 					var resolutionScale = scaleOverride == null ? (int)DisplayInformation.GetForCurrentView().ResolutionScale : (int)scaleOverride;
 
+					// On Windows, the minimum scale is 100%, however, on Wasm, we can have lower scales.
+					// This condition is to allow Wasm to use the .scale-100 image when the scale is < 100%
+					if (resolutionScale < 100)
+					{
+						resolutionScale = 100;
+					}
+
+
 					for (var i = KnownScales.Length - 1; i >= 0; i--)
 					{
 						var probeScale = KnownScales[i];