summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgirard@chromium.org <girard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-24 17:07:48 +0000
committergirard@chromium.org <girard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-24 17:07:48 +0000
commitb84d459957a85bfcbba9f429511650806fca10ec (patch)
tree4fcb875667e99d0adf88ff6a4dd2931d21236e14
parent428e08f2b3a4416a3f2c68285f1ae682d15d7316 (diff)
downloadchromium_src-b84d459957a85bfcbba9f429511650806fca10ec.zip
chromium_src-b84d459957a85bfcbba9f429511650806fca10ec.tar.gz
chromium_src-b84d459957a85bfcbba9f429511650806fca10ec.tar.bz2
Stylus is no longer ignored.
It turns out that Windows generates mouse events for stylus, but doesn't generate touch events. We have been ignoring stylus generated mouse events, under the assumption that we would be receiving touch events for the same operation. We now distinguish between touch and stylus messages, and we no longer flag the stylus messages as touch. BUG=139454 Review URL: https://chromiumcodereview.appspot.com/10831398 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@153232 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--ui/base/win/events_win.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/ui/base/win/events_win.cc b/ui/base/win/events_win.cc
index 0dd8429..3b2569c 100644
--- a/ui/base/win/events_win.cc
+++ b/ui/base/win/events_win.cc
@@ -16,8 +16,10 @@ namespace ui {
namespace {
-// From MSDN.
-#define MOUSEEVENTF_FROMTOUCH 0xFF515700
+// From MSDN: "Mouse" events are flagged with 0xFF515700 if they come
+// from a touch or stylus device. In Vista or later, they are also flagged
+// with 0x80 if they come from touch.
+#define MOUSEEVENTF_FROMTOUCH (0xFF515700 | 0x80)
// Get the native mouse key state from the native event message type.
int GetNativeMouseKey(const base::NativeEvent& native_event) {