From 1b27bf7bac95872b7934337fb181fcb0ebbfa797 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=B0=D0=BD=D0=B8=D0=BB=20=D0=AE=D1=81=D1=83=D0=BF?= =?UTF-8?q?=D0=BE=D0=B2?= Date: Mon, 20 May 2024 16:42:16 +0500 Subject: [PATCH] Fix for #7284 (#15734) Comparing WindowVersion with Windows8_1 instead of Windows8 Co-authored-by: Max Katz --- src/Windows/Avalonia.Win32/FramebufferManager.cs | 2 +- src/Windows/Avalonia.Win32/WindowImpl.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Windows/Avalonia.Win32/FramebufferManager.cs b/src/Windows/Avalonia.Win32/FramebufferManager.cs index ddf90e70e6..5c8e84aaa6 100644 --- a/src/Windows/Avalonia.Win32/FramebufferManager.cs +++ b/src/Windows/Avalonia.Win32/FramebufferManager.cs @@ -88,7 +88,7 @@ namespace Avalonia.Win32 private Vector GetCurrentDpi() { - if (UnmanagedMethods.ShCoreAvailable && Win32Platform.WindowsVersion > PlatformConstants.Windows8) + if (UnmanagedMethods.ShCoreAvailable && Win32Platform.WindowsVersion >= PlatformConstants.Windows8_1) { var monitor = UnmanagedMethods.MonitorFromWindow(_hwnd, UnmanagedMethods.MONITOR.MONITOR_DEFAULTTONEAREST); diff --git a/src/Windows/Avalonia.Win32/WindowImpl.cs b/src/Windows/Avalonia.Win32/WindowImpl.cs index 8a09cff07f..e2fb60f4ca 100644 --- a/src/Windows/Avalonia.Win32/WindowImpl.cs +++ b/src/Windows/Avalonia.Win32/WindowImpl.cs @@ -937,7 +937,7 @@ namespace Avalonia.Win32 RegisterTouchWindow(_hwnd, 0); - if (ShCoreAvailable && Win32Platform.WindowsVersion > PlatformConstants.Windows8) + if (ShCoreAvailable && Win32Platform.WindowsVersion >= PlatformConstants.Windows8_1) { var monitor = MonitorFromWindow( _hwnd,