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/qcocoaview_mac.mm | |
| 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/qcocoaview_mac.mm')
| -rw-r--r-- | src/gui/kernel/qcocoaview_mac.mm | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/src/gui/kernel/qcocoaview_mac.mm b/src/gui/kernel/qcocoaview_mac.mm index 9aa4dd2..e8e52f9 100644 --- a/src/gui/kernel/qcocoaview_mac.mm +++ b/src/gui/kernel/qcocoaview_mac.mm @@ -704,11 +704,6 @@ extern "C" { - (void)mouseUp:(NSEvent *)theEvent { -#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6 - if (QSysInfo::MacintoshVersion >= QSysInfo::MV_10_6) - QCocoaTouch::setMouseInDraggingState(false); -#endif - bool mouseOK = qt_mac_handleMouseEvent(self, theEvent, QEvent::MouseButtonRelease, Qt::LeftButton); if (!mouseOK) @@ -752,11 +747,6 @@ extern "C" { - (void)mouseDragged:(NSEvent *)theEvent { -#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6 - if (QSysInfo::MacintoshVersion >= QSysInfo::MV_10_6) - QCocoaTouch::setMouseInDraggingState(true); -#endif - qMacDnDParams()->view = self; qMacDnDParams()->theEvent = theEvent; bool mouseOK = qt_mac_handleMouseEvent(self, theEvent, QEvent::MouseMove, Qt::LeftButton); @@ -883,22 +873,22 @@ extern "C" { #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6 - (void)touchesBeganWithEvent:(NSEvent *)event; { - qt_translateRawTouchEvent(QCocoaTouch::getCurrentTouchPointList(event), qwidget); + qt_translateRawTouchEvent(QCocoaTouch::getCurrentTouchPointList(event, true), qwidget); } - (void)touchesMovedWithEvent:(NSEvent *)event; { - qt_translateRawTouchEvent(QCocoaTouch::getCurrentTouchPointList(event), qwidget); + qt_translateRawTouchEvent(QCocoaTouch::getCurrentTouchPointList(event, true), qwidget); } - (void)touchesEndedWithEvent:(NSEvent *)event; { - qt_translateRawTouchEvent(QCocoaTouch::getCurrentTouchPointList(event), qwidget); + qt_translateRawTouchEvent(QCocoaTouch::getCurrentTouchPointList(event, true), qwidget); } - (void)touchesCancelledWithEvent:(NSEvent *)event; { - qt_translateRawTouchEvent(QCocoaTouch::getCurrentTouchPointList(event), qwidget); + qt_translateRawTouchEvent(QCocoaTouch::getCurrentTouchPointList(event, true), qwidget); } - (void)magnifyWithEvent:(NSEvent *)event; |