Browse Source

Fix for #7284 (#15734)

Comparing WindowVersion with Windows8_1 instead of Windows8

Co-authored-by: Max Katz <maxkatz6@outlook.com>
release/11.1.3
Данил Юсупов 2 years ago
committed by Max Katz
parent
commit
ddd145329b
  1. 2
      src/Windows/Avalonia.Win32/FramebufferManager.cs
  2. 2
      src/Windows/Avalonia.Win32/WindowImpl.cs

2
src/Windows/Avalonia.Win32/FramebufferManager.cs

@ -88,7 +88,7 @@ namespace Avalonia.Win32
private Vector GetCurrentDpi() private Vector GetCurrentDpi()
{ {
if (UnmanagedMethods.ShCoreAvailable && Win32Platform.WindowsVersion > PlatformConstants.Windows8) if (UnmanagedMethods.ShCoreAvailable && Win32Platform.WindowsVersion >= PlatformConstants.Windows8_1)
{ {
var monitor = var monitor =
UnmanagedMethods.MonitorFromWindow(_hwnd, UnmanagedMethods.MONITOR.MONITOR_DEFAULTTONEAREST); UnmanagedMethods.MonitorFromWindow(_hwnd, UnmanagedMethods.MONITOR.MONITOR_DEFAULTTONEAREST);

2
src/Windows/Avalonia.Win32/WindowImpl.cs

@ -937,7 +937,7 @@ namespace Avalonia.Win32
RegisterTouchWindow(_hwnd, 0); RegisterTouchWindow(_hwnd, 0);
if (ShCoreAvailable && Win32Platform.WindowsVersion > PlatformConstants.Windows8) if (ShCoreAvailable && Win32Platform.WindowsVersion >= PlatformConstants.Windows8_1)
{ {
var monitor = MonitorFromWindow( var monitor = MonitorFromWindow(
_hwnd, _hwnd,

Loading…
Cancel
Save