From edbd75cc1f9adf432988952f36c6a8c6939cb213 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Fri, 8 Nov 2019 16:36:15 +0000 Subject: [PATCH] [OSX] fix popup position and mouse device positioning. --- src/Avalonia.Native/AvaloniaNativePlatform.cs | 1 - src/Avalonia.Native/WindowImplBase.cs | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Avalonia.Native/AvaloniaNativePlatform.cs b/src/Avalonia.Native/AvaloniaNativePlatform.cs index fab3ce36b8..571475c7ea 100644 --- a/src/Avalonia.Native/AvaloniaNativePlatform.cs +++ b/src/Avalonia.Native/AvaloniaNativePlatform.cs @@ -21,7 +21,6 @@ namespace Avalonia.Native [DllImport("libAvaloniaNative")] static extern IntPtr CreateAvaloniaNative(); - internal static readonly MouseDevice MouseDevice = new MouseDevice(); internal static readonly KeyboardDevice KeyboardDevice = new KeyboardDevice(); public Size DoubleClickSize => new Size(4, 4); diff --git a/src/Avalonia.Native/WindowImplBase.cs b/src/Avalonia.Native/WindowImplBase.cs index 7f1fab4b1c..8b397403ca 100644 --- a/src/Avalonia.Native/WindowImplBase.cs +++ b/src/Avalonia.Native/WindowImplBase.cs @@ -96,7 +96,7 @@ namespace Avalonia.Native public Action Paint { get; set; } public Action Resized { get; set; } public Action Closed { get; set; } - public IMouseDevice MouseDevice => AvaloniaNativePlatform.MouseDevice; + public IMouseDevice MouseDevice => _mouse; public abstract IPopupImpl CreatePopup();