| Index: ui/views/win/hwnd_message_handler.cc
|
| ===================================================================
|
| --- ui/views/win/hwnd_message_handler.cc (revision 240282)
|
| +++ ui/views/win/hwnd_message_handler.cc (working copy)
|
| @@ -1512,14 +1512,17 @@
|
| WPARAM w_param,
|
| LPARAM l_param) {
|
| #if defined(USE_AURA)
|
| - if (!touch_ids_.empty())
|
| + if (!touch_ids_.empty() && message != WM_MOUSEMOVE &&
|
| + message != WM_MOUSELEAVE) {
|
| return 0;
|
| + }
|
| // We handle touch events on Windows Aura. Windows generates synthesized
|
| // mouse messages in response to touch which we should ignore. However touch
|
| // messages are only received for the client area. We need to ignore the
|
| // synthesized mouse messages for all points in the client area and places
|
| // which return HTNOWHERE.
|
| - if (ui::IsMouseEventFromTouch(message)) {
|
| + if (message != WM_MOUSEMOVE && message != WM_MOUSELEAVE &&
|
| + ui::IsMouseEventFromTouch(message)) {
|
| LPARAM l_param_ht = l_param;
|
| // For mouse events (except wheel events), location is in window coordinates
|
| // and should be converted to screen coordinates for WM_NCHITTEST.
|
|
|