forked from electron/electron
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: handle non client pointer events from pen on Win10 (electron#24042)
- Loading branch information
Showing
2 changed files
with
29 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
28 changes: 28 additions & 0 deletions
28
patches/chromium/fix_handling_non_client_pointer_events_from_pen_on_windows_10.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
From: Cheng Zhao <zcbenz@gmail.com> | ||
Date: Thu, 4 Oct 2018 14:57:02 -0700 | ||
Subject: fix: handle non client pointer events from pen on Windows 10 | ||
|
||
Refs: https://github.com/electron/electron/issues/21440 | ||
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2237535 | ||
|
||
diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc | ||
index faa47e9ef7f388dc0bfa5cd3efb961e6339ce390..274b9c247b8f970a6cf2be7b149d1885163551d9 100644 | ||
--- a/ui/views/win/hwnd_message_handler.cc | ||
+++ b/ui/views/win/hwnd_message_handler.cc | ||
@@ -1988,6 +1988,15 @@ LRESULT HWNDMessageHandler::OnPointerEvent(UINT message, | ||
return -1; | ||
} | ||
|
||
+ // Pen may also send non client pointer messages, treat them as normal | ||
+ // touch events so they can be properly handled. | ||
+ if (pointer_type == PT_PEN && | ||
+ (message == WM_NCPOINTERDOWN || | ||
+ message == WM_NCPOINTERUP || | ||
+ message == WM_NCPOINTERUPDATE)) { | ||
+ pointer_type = PT_TOUCH; | ||
+ } | ||
+ | ||
switch (pointer_type) { | ||
case PT_PEN: | ||
return HandlePointerEventTypePen(message, w_param, l_param); |