diff options
| author | Richard Moe Gustavsen <richard.gustavsen@nokia.com> | 2009-06-22 11:20:03 (GMT) |
|---|---|---|
| committer | Richard Moe Gustavsen <richard.gustavsen@nokia.com> | 2009-06-22 11:29:05 (GMT) |
| commit | 627a3b8928157bb7f25af406f61a2f9c5cb41e06 (patch) | |
| tree | 6a352342fc1f8a9fe68329a87175cdc4f1ccede8 /src/gui/kernel/qmultitouch_mac_p.h | |
| parent | cb9852297373b8bdf462ea097e639b7dee11b972 (diff) | |
| download | Qt-627a3b8928157bb7f25af406f61a2f9c5cb41e06.zip Qt-627a3b8928157bb7f25af406f61a2f9c5cb41e06.tar.gz Qt-627a3b8928157bb7f25af406f61a2f9c5cb41e06.tar.bz2 | |
Multitouch, Cocoa: Mask mouse hover from the touch set
After a lot of thinking, the conclusion is that we really need to
to this. Lets see if we can add a flag to control it next.
Diffstat (limited to 'src/gui/kernel/qmultitouch_mac_p.h')
| -rw-r--r-- | src/gui/kernel/qmultitouch_mac_p.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/gui/kernel/qmultitouch_mac_p.h b/src/gui/kernel/qmultitouch_mac_p.h index 92ed11a..9ec256a 100644 --- a/src/gui/kernel/qmultitouch_mac_p.h +++ b/src/gui/kernel/qmultitouch_mac_p.h @@ -53,8 +53,6 @@ #ifndef QMULTITOUCH_MAC_P_H #define QMULTITOUCH_MAC_P_H -#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6 - #ifdef QT_MAC_USE_COCOA #import <Cocoa/Cocoa.h> #endif @@ -63,6 +61,8 @@ #include <qhash.h> #include <QtCore> +#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6 + QT_BEGIN_NAMESPACE #ifdef QT_MAC_USE_COCOA @@ -70,15 +70,16 @@ QT_BEGIN_NAMESPACE class QCocoaTouch { public: - static QList<QTouchEvent::TouchPoint> getCurrentTouchPointList(NSEvent *event); + static QList<QTouchEvent::TouchPoint> getCurrentTouchPointList(NSEvent *event, bool maskMouseHover); static void setMouseInDraggingState(bool inDraggingState); private: static QHash<int, QCocoaTouch*> _currentTouches; static QPointF _screenReferencePos; static QPointF _trackpadReferencePos; - static bool _inMouseDraggingState; static int _idAssignmentCount; + static int _touchCount; + static bool _maskMouseHover; QTouchEvent::TouchPoint _touchPoint; QPointF _trackpadPos; @@ -90,7 +91,6 @@ class QCocoaTouch void updateTouchData(NSTouch *nstouch, NSTouchPhase phase); static QCocoaTouch *findQCocoaTouch(NSTouch *nstouch); static Qt::TouchPointState toTouchPointState(NSTouchPhase nsState); - static void validateCurrentTouchList(NSEvent *event); }; #endif // QT_MAC_USE_COCOA |