Skip to content

修复开启 WM_Pointer 后，非主屏获取的 GetTouchPoint/GetStylusPoint 坐标错误 #9

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

Merged
merged 1 commit into from
Dec 5, 2023
Merged

修复开启 WM_Pointer 后，非主屏获取的 GetTouchPoint/GetStylusPoint 坐标错误 #9

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
21 changes: 17 additions & 4 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
Expand Up @@ -2,7 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.



using MS.Internal;
using MS.Internal.Interop;
using MS.Internal.PresentationCore;
Expand Down Expand Up @@ -223,7 +223,7 @@ private bool ProcessMessage(uint pointerId, RawStylusActions action, int timesta
if (data.IsValid
&& (data.Info.pointerType == UnsafeNativeMethods.POINTER_INPUT_TYPE.PT_TOUCH
|| data.Info.pointerType == UnsafeNativeMethods.POINTER_INPUT_TYPE.PT_PEN))
{
{
uint cursorId = 0;

if (UnsafeNativeMethods.GetPointerCursorId(pointerId, ref cursorId))
Expand All @@ -236,7 +236,7 @@ private bool ProcessMessage(uint pointerId, RawStylusActions action, int timesta
{
return false;
}

// Convert move to InAirMove if applicable
if (action == RawStylusActions.Move
&& (!data.Info.pointerFlags.HasFlag(UnsafeNativeMethods.POINTER_FLAGS.POINTER_FLAG_INCONTACT)
Expand Down Expand Up @@ -325,7 +325,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.Value.RootVisual.PointToScreen(new Point(0, 0));
Point originScreenCoord = new Point();

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

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