diff options
| author | girard@chromium.org <girard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-05 18:11:10 +0000 |
|---|---|---|
| committer | girard@chromium.org <girard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-05 18:11:10 +0000 |
| commit | 568318d0a54a9c8328e119ac6ead7830fd5ff3ed (patch) | |
| tree | 8c60ef2e4472e1e69e0c565a2e8e45f96462dbf9 /ui | |
| parent | 75df8ddffe6812bdff9d3b6f54a7e13e76c7e8de (diff) | |
| download | chromium_src-568318d0a54a9c8328e119ac6ead7830fd5ff3ed.zip chromium_src-568318d0a54a9c8328e119ac6ead7830fd5ff3ed.tar.gz chromium_src-568318d0a54a9c8328e119ac6ead7830fd5ff3ed.tar.bz2 | |
Corrections to IsMouseEventFromTouch (correctly captures _all_ events now.)
BUG=159355
Review URL: https://chromiumcodereview.appspot.com/11275144
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165957 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/base/win/events_win.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/ui/base/win/events_win.cc b/ui/base/win/events_win.cc index 96c09f9..d56d968 100644 --- a/ui/base/win/events_win.cc +++ b/ui/base/win/events_win.cc @@ -350,9 +350,7 @@ int GetModifiersFromKeyState() { // Windows emulates mouse messages for touch events. bool IsMouseEventFromTouch(UINT message) { - return (message == WM_MOUSEMOVE || - message == WM_LBUTTONDOWN || message == WM_LBUTTONUP || - message == WM_RBUTTONDOWN || message == WM_RBUTTONUP) && + return (message >= WM_MOUSEFIRST) && (message <= WM_MOUSELAST) && (GetMessageExtraInfo() & MOUSEEVENTF_FROMTOUCH) == MOUSEEVENTF_FROMTOUCH; } |