Skip to content

Pass the HwndSource parameters directly #11124

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
Open

Pass the HwndSource parameters directly #11124

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
10 changes: 4 additions & 6 deletions src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Input/Stylus/Wisp/WispLogic.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3137,10 +3137,8 @@ internal bool Enabled
}

/////////////////////////////////////////////////////////////////////
internal void RegisterHwndForInput(InputManager inputManager, PresentationSource inputSource)
internal void RegisterHwndForInput(InputManager inputManager, HwndSource hwndSource)
{
HwndSource hwndSource = (HwndSource)inputSource;

GetAndCacheTransformToDeviceMatrix(hwndSource);

// Keep track so we don't bother looking for changes if someone happened to query this before
Expand All @@ -3152,14 +3150,14 @@ internal void RegisterHwndForInput(InputManager inputManager, PresentationSource

lock (__penContextsLock)
{
if (__penContextsMap.ContainsKey(inputSource))
if (__penContextsMap.ContainsKey(hwndSource))
{
throw new InvalidOperationException(SR.PenService_WindowAlreadyRegistered);
}

PenContexts penContexts = new PenContexts(StylusLogic.GetCurrentStylusLogicAs<WispLogic>(), inputSource);
PenContexts penContexts = new PenContexts(StylusLogic.GetCurrentStylusLogicAs<WispLogic>(), hwndSource);

__penContextsMap[inputSource] = penContexts;
__penContextsMap[hwndSource] = penContexts;

// If FIRST one set this as the one to manage TabletAdded/Removed notifications.
if (__penContextsMap.Count == 1)
Expand Down