From 6f5bae821b47e4671da4456ad3acbed7b15bd6a2 Mon Sep 17 00:00:00 2001 From: robloo Date: Sat, 22 Oct 2022 11:38:48 -0400 Subject: [PATCH] Fix usage of updated Screen properties This fixes the macOS build --- native/Avalonia.Native/src/OSX/Screens.mm | 4 ++-- src/Windows/Avalonia.Win32/WinScreen.cs | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/native/Avalonia.Native/src/OSX/Screens.mm b/native/Avalonia.Native/src/OSX/Screens.mm index b9c75ed742..83ab1bfd01 100644 --- a/native/Avalonia.Native/src/OSX/Screens.mm +++ b/native/Avalonia.Native/src/OSX/Screens.mm @@ -41,9 +41,9 @@ public: ret->WorkingArea.X = [screen visibleFrame].origin.x; ret->WorkingArea.Y = ConvertPointY(ToAvnPoint([screen visibleFrame].origin)).Y - ret->WorkingArea.Height; - ret->PixelDensity = [screen backingScaleFactor]; + ret->Scaling = [screen backingScaleFactor]; - ret->Primary = index == 0; + ret->IsPrimary = index == 0; return S_OK; } diff --git a/src/Windows/Avalonia.Win32/WinScreen.cs b/src/Windows/Avalonia.Win32/WinScreen.cs index f103cc3b66..1038f41a17 100644 --- a/src/Windows/Avalonia.Win32/WinScreen.cs +++ b/src/Windows/Avalonia.Win32/WinScreen.cs @@ -7,7 +7,8 @@ namespace Avalonia.Win32 { private readonly IntPtr _hMonitor; - public WinScreen(double pixelDensity, PixelRect bounds, PixelRect workingArea, bool primary, IntPtr hMonitor) : base(pixelDensity, bounds, workingArea, primary) + public WinScreen(double scaling, PixelRect bounds, PixelRect workingArea, bool isPrimary, IntPtr hMonitor) + : base(scaling, bounds, workingArea, isPrimary) { _hMonitor = hMonitor; }