Skip to content

Fix incorrect touch point coordinates when running application on secondary screen with WM_Pointer enabled #11051

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+15 −2
Open

Fix incorrect touch point coordinates when running application on secondary screen with WM_Pointer enabled #11051

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions ...rosoft.DotNet.Wpf/src/PresentationCore/System/Windows/InterOp/HwndPointerInputProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Licensed to the .NET Foundation under one or more agreements.
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.


Expand Down Expand Up @@ -315,7 +315,20 @@ private bool ProcessMessage(uint pointerId, RawStylusActions action, int timesta
/// <param name="originOffsetY">The Y offset in logical coordiantes</param>
private void GetOriginOffsetsLogical(out int originOffsetX, out int originOffsetY)
{
Point originScreenCoord = _source.RootVisual.PointToScreen(new Point(0, 0));
Point originScreenCoord = new Point();

HwndSource hwndSource = PresentationSource.FromVisual(_source.RootVisual) as HwndSource;
if (hwndSource != null)
{
HandleRef handleRef = new HandleRef(hwndSource, hwndSource.Handle);

MS.Win32.NativeMethods.POINT point = new MS.Win32.NativeMethods.POINT();
MS.Win32.UnsafeNativeMethods.ClientToScreen(handleRef, ref point);

var displayRect = _currentTabletDevice.DeviceInfo.DisplayRect;

originScreenCoord = new Point(point.x - displayRect.left, point.y - displayRect.top);
}

// Use the inverse of our logical tablet to screen matrix to generate tablet coords
MatrixTransform screenToTablet = new MatrixTransform(_currentTabletDevice.TabletToScreen);
Expand Down