summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
authorBradley T. Hughes <bradley.hughes@nokia.com>2009-06-18 10:49:11 (GMT)
committerBradley T. Hughes <bradley.hughes@nokia.com>2009-06-18 10:49:11 (GMT)
commit3b04dba36b31360d94583f382b9054bcdea0e2a7 (patch)
treef56d1329980987a21d0c457e21ebb99f820e3ef2 /src/corelib
parent9756f523fd1c31192a87c65449434280a59b49f7 (diff)
downloadQt-3b04dba36b31360d94583f382b9054bcdea0e2a7.zip
Qt-3b04dba36b31360d94583f382b9054bcdea0e2a7.tar.gz
Qt-3b04dba36b31360d94583f382b9054bcdea0e2a7.tar.bz2
Change behavior of how touch and mouse events work together
We now send both types of events, i.e. accepting TouchBegin doesn't block mouse events anymore. We are also introducing the idea of a "primary" touch point, which is the one that the system is also generating mouse events for. This lets us reuse existing mouse event code while still being able to add multi-touch support.
Diffstat (limited to 'src/corelib')
-rw-r--r--src/corelib/global/qnamespace.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h
index 6e7bc51..fe11fab 100644
--- a/src/corelib/global/qnamespace.h
+++ b/src/corelib/global/qnamespace.h
@@ -1550,7 +1550,10 @@ public:
TouchPointPressed = 0x01,
TouchPointMoved = 0x02,
TouchPointStationary = 0x04,
- TouchPointReleased = 0x08
+ TouchPointReleased = 0x08,
+ TouchPointStateMask = 0x0f,
+
+ TouchPointPrimary = 0x10
};
Q_DECLARE_FLAGS(TouchPointStates, TouchPointState)