From b9eb5e113bdc16682c13078c97966f74e6399a02 Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Wed, 10 Jun 2020 09:40:37 +0900 Subject: [PATCH 1/3] fix: handle non client pointer events from pen on Win10 --- patches/chromium/.patches | 2 ++ ...ointer_events_from_pen_on_windows_10.patch | 28 +++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 patches/chromium/fix_handling_non_client_pointer_events_from_pen_on_windows_10.patch diff --git a/patches/chromium/.patches b/patches/chromium/.patches index 0557c287de217..d9345a6007fae 100644 --- a/patches/chromium/.patches +++ b/patches/chromium/.patches @@ -103,3 +103,5 @@ fix_swap_global_proxies_before_initializing_the_windows_proxies.patch fix_default_to_ntlm_v2_in_network_service.patch a11y_iterate_all_descendants_for_getselectioncount.patch a11y_allows_klistboxoption_as_an_item_to_kgroup.patch +feat_add_streaming-protocol_registry_to_multibuffer_data_source.patch +fix_handling_non_client_pointer_events_from_pen_on_windows_10.patch diff --git a/patches/chromium/fix_handling_non_client_pointer_events_from_pen_on_windows_10.patch b/patches/chromium/fix_handling_non_client_pointer_events_from_pen_on_windows_10.patch new file mode 100644 index 0000000000000..ae827f0d11c20 --- /dev/null +++ b/patches/chromium/fix_handling_non_client_pointer_events_from_pen_on_windows_10.patch @@ -0,0 +1,28 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Cheng Zhao +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); From 8847a0f9c345d98539398c6da6bfbca38a713016 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Fri, 12 Jun 2020 16:53:05 -0500 Subject: [PATCH 2/3] fix trop oops --- patches/chromium/.patches | 1 - 1 file changed, 1 deletion(-) diff --git a/patches/chromium/.patches b/patches/chromium/.patches index d9345a6007fae..5e70202ebeee6 100644 --- a/patches/chromium/.patches +++ b/patches/chromium/.patches @@ -103,5 +103,4 @@ fix_swap_global_proxies_before_initializing_the_windows_proxies.patch fix_default_to_ntlm_v2_in_network_service.patch a11y_iterate_all_descendants_for_getselectioncount.patch a11y_allows_klistboxoption_as_an_item_to_kgroup.patch -feat_add_streaming-protocol_registry_to_multibuffer_data_source.patch fix_handling_non_client_pointer_events_from_pen_on_windows_10.patch From ba3fe4b9d2f1dd935fa31269e397d8b4f6f8362e Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Mon, 15 Jun 2020 14:23:33 +0900 Subject: [PATCH 3/3] update patches --- ...ing_non_client_pointer_events_from_pen_on_windows_10.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/patches/chromium/fix_handling_non_client_pointer_events_from_pen_on_windows_10.patch b/patches/chromium/fix_handling_non_client_pointer_events_from_pen_on_windows_10.patch index ae827f0d11c20..fa35205e6ac14 100644 --- a/patches/chromium/fix_handling_non_client_pointer_events_from_pen_on_windows_10.patch +++ b/patches/chromium/fix_handling_non_client_pointer_events_from_pen_on_windows_10.patch @@ -7,10 +7,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 +index 281c722d81c0ad5fa7bacbe25c07a7578dfa43b6..037ace982ed86c515e7b024d0cd2862d604ec63b 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, +@@ -1993,6 +1993,15 @@ LRESULT HWNDMessageHandler::OnPointerEvent(UINT message, return -1; }