Merge pull request #167 from unoplatform/dev/dr/unoSupport

feat: Replicate changes made for multi-window support
unoplatform · Feb 6, 2024 · 0d96706 · 0d96706
2 parents 148af33 + 91c09a3
commit 0d96706
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/Uno.UI.RuntimeTests.Engine.Library/Engine/UI/UnitTestsControl.cs b/src/Uno.UI.RuntimeTests.Engine.Library/Engine/UI/UnitTestsControl.cs
@@ -100,7 +100,7 @@ public UnitTestsControl()
 			GetContent: () => unitTestContentRoot.Content as UIElement,
 			SetContent: elt => unitTestContentRoot.Content = elt
 		);
-		UnitTestsUIContentHelper.CurrentTestWindow = XamlWindow.Current;
+		UnitTestsUIContentHelper.CurrentTestWindow ??= XamlWindow.Current;
 
 		DataContext = null;
 

diff --git a/src/Uno.UI.RuntimeTests.Engine.Library/Library/Helpers/UIHelper.cs b/src/Uno.UI.RuntimeTests.Engine.Library/Library/Helpers/UIHelper.cs
@@ -193,7 +193,7 @@ public static async ValueTask<TestBitmap> ScreenShot(FrameworkElement element, b
 		{
 			case ScreenShotScalingMode.UsePhysicalPixelsWithImplicitScaling:
 				await renderer.RenderAsync(element);
-				bitmap = await TestBitmap.From(renderer, element, DisplayInformation.GetForCurrentView()?.RawPixelsPerViewPixel ?? 1);
+				bitmap = await TestBitmap.From(renderer, element, element.XamlRoot?.RasterizationScale ?? 1);
 				break;
 			case ScreenShotScalingMode.UseLogicalPixels:
 				await renderer.RenderAsync(element, (int)element.RenderSize.Width, (int)element.RenderSize.Height);