MCL/sf/mw/qt: comparison src/gui/kernel/qcocoaview

equal deleted inserted replaced

-:56cd8111b7f7
+:41300fa6a67c
 #include <QFileInfo>
 #include <QFile>
 #include <qdebug.h>
-@interface NSEvent (DeviceDelta)
+@interface NSEvent (Qt_Compile_Leopard_DeviceDelta)
 - (CGFloat)deviceDeltaX;
 - (CGFloat)deviceDeltaY;
 - (CGFloat)deviceDeltaZ;
+@end
+@interface NSEvent (Qt_Compile_Leopard_Gestures)
+- (CGFloat)magnification;
 @end
 QT_BEGIN_NAMESPACE
 Q_GLOBAL_STATIC(DnDParams, qMacDnDParams);
 extern void qt_mac_update_cursor_at_global_pos(const QPoint &globalPos); // qcursor_mac.mm
 extern bool qt_sendSpontaneousEvent(QObject *, QEvent *); // qapplication.cpp
 extern OSViewRef qt_mac_nativeview_for(const QWidget *w); // qwidget_mac.mm
 extern const QStringList& qEnabledDraggedTypes(); // qmime_mac.cpp
 extern QPointer<QWidget> qt_mouseover; //qapplication_mac.mm
+extern QPointer<QWidget> qt_button_down; //qapplication_mac.cpp
 Qt::MouseButton cocoaButton2QtButton(NSInteger buttonNum)
 {
 if (buttonNum == 0)
 return Qt::LeftButton;
 }
 }
 - (void)mouseDown:(NSEvent *)theEvent
 {
+if (!qt_button_down)
+qt_button_down = qwidget;
 qt_mac_handleMouseEvent(self, theEvent, QEvent::MouseButtonPress, Qt::LeftButton);
 // Don't call super here. This prevents us from getting the mouseUp event,
 // which we need to send even if the mouseDown event was not accepted.
 // (this is standard Qt behavior.)
 }
 - (void)mouseUp:(NSEvent *)theEvent
 {
-bool mouseOK = qt_mac_handleMouseEvent(self, theEvent, QEvent::MouseButtonRelease, Qt::LeftButton);
+qt_mac_handleMouseEvent(self, theEvent, QEvent::MouseButtonRelease, Qt::LeftButton);
-if (!mouseOK)
+qt_button_down = 0;
-[super mouseUp:theEvent];
 }
 - (void)rightMouseDown:(NSEvent *)theEvent
 {
-bool mouseOK = qt_mac_handleMouseEvent(self, theEvent, QEvent::MouseButtonPress, Qt::RightButton);
+if (!qt_button_down)
+qt_button_down = qwidget;
-if (!mouseOK)
-[super rightMouseDown:theEvent];
+qt_mac_handleMouseEvent(self, theEvent, QEvent::MouseButtonPress, Qt::RightButton);
 }
 - (void)rightMouseUp:(NSEvent *)theEvent
 {
-bool mouseOK = qt_mac_handleMouseEvent(self, theEvent, QEvent::MouseButtonRelease, Qt::RightButton);
+qt_mac_handleMouseEvent(self, theEvent, QEvent::MouseButtonRelease, Qt::RightButton);
-if (!mouseOK)
+qt_button_down = 0;
-[super rightMouseUp:theEvent];
 }
 - (void)otherMouseDown:(NSEvent *)theEvent
 {
+if (!qt_button_down)
+qt_button_down = qwidget;
 Qt::MouseButton mouseButton = cocoaButton2QtButton([theEvent buttonNumber]);
-bool mouseOK = qt_mac_handleMouseEvent(self, theEvent, QEvent::MouseButtonPress, mouseButton);
+qt_mac_handleMouseEvent(self, theEvent, QEvent::MouseButtonPress, mouseButton);
-if (!mouseOK)
-[super otherMouseDown:theEvent];
 }
 - (void)otherMouseUp:(NSEvent *)theEvent
 {
 Qt::MouseButton mouseButton = cocoaButton2QtButton([theEvent buttonNumber]);
-bool mouseOK = qt_mac_handleMouseEvent(self, theEvent,  QEvent::MouseButtonRelease, mouseButton);
+qt_mac_handleMouseEvent(self, theEvent,  QEvent::MouseButtonRelease, mouseButton);
-if (!mouseOK)
+qt_button_down = 0;
-[super otherMouseUp:theEvent];
 }
 - (void)mouseDragged:(NSEvent *)theEvent
 {
 qMacDnDParams()->view = self;
 qMacDnDParams()->theEvent = theEvent;
-bool mouseOK = qt_mac_handleMouseEvent(self, theEvent, QEvent::MouseMove, Qt::LeftButton);
+qt_mac_handleMouseEvent(self, theEvent, QEvent::MouseMove, Qt::NoButton);
-if (!mouseOK)
-[super mouseDragged:theEvent];
 }
 - (void)rightMouseDragged:(NSEvent *)theEvent
 {
 qMacDnDParams()->view = self;
 qMacDnDParams()->theEvent = theEvent;
-bool mouseOK = qt_mac_handleMouseEvent(self, theEvent, QEvent::MouseMove, Qt::RightButton);
+qt_mac_handleMouseEvent(self, theEvent, QEvent::MouseMove, Qt::NoButton);
-if (!mouseOK)
-[super rightMouseDragged:theEvent];
 }
 - (void)otherMouseDragged:(NSEvent *)theEvent
 {
 qMacDnDParams()->view = self;
 qMacDnDParams()->theEvent = theEvent;
-Qt::MouseButton mouseButton = cocoaButton2QtButton([theEvent buttonNumber]);
+qt_mac_handleMouseEvent(self, theEvent, QEvent::MouseMove, Qt::NoButton);
-bool mouseOK = qt_mac_handleMouseEvent(self, theEvent, QEvent::MouseMove, mouseButton);
-if (!mouseOK)
-[super otherMouseDragged:theEvent];
 }
 - (void)scrollWheel:(NSEvent *)theEvent
 {
 // Give the Input Manager a chance to process the wheel event.
 NSPoint windowPoint = [theEvent locationInWindow];
 NSPoint globalPoint = [[theEvent window] convertBaseToScreen:windowPoint];
 NSPoint localPoint = [self convertPoint:windowPoint fromView:nil];
 QPoint qlocal = QPoint(localPoint.x, localPoint.y);
-QPoint qglobal = QPoint(globalPoint.x, globalPoint.y);
+QPoint qglobal = QPoint(globalPoint.x, flipYCoordinate(globalPoint.y));
-Qt::MouseButton buttons = cocoaButton2QtButton([theEvent buttonNumber]);
+Qt::MouseButtons buttons = QApplication::mouseButtons();
 bool wheelOK = false;
 Qt::KeyboardModifiers keyMods = qt_cocoaModifiers2QtModifiers([theEvent modifierFlags]);
 QWidget *widgetToGetMouse = qwidget;
+// if popup is open it should get wheel events if the cursor is over the popup,
+// otherwise the event should be ignored.
+if (QWidget *popup = qAppInstance()->activePopupWidget()) {
+if (!popup->geometry().contains(qglobal))
+return;
+}
 int deltaX = 0;
 int deltaY = 0;
 int deltaZ = 0;
 const EventRef carbonEvent = (EventRef)[theEvent eventRef];
 const UInt32 carbonEventKind = carbonEvent ? ::GetEventKind(carbonEvent) : 0;
-if (carbonEventKind == kEventMouseScroll) {
+const bool scrollEvent = carbonEventKind == kEventMouseScroll;
+if (scrollEvent) {
 // The mouse device containts pixel scroll wheel support (Mighty Mouse, Trackpad).
 // Since deviceDelta is delivered as pixels rather than degrees, we need to
 // convert from pixels to degrees in a sensible manner.
 // It looks like four degrees per pixel behaves most native.
 // Qt expects the unit for delta to be 1/8 of a degree:
-const int scrollFactor = 4 * 8;
+deltaX = [theEvent deviceDeltaX];
-deltaX = (int)[theEvent deviceDeltaX] * scrollFactor;
+deltaY = [theEvent deviceDeltaY];
-deltaY = (int)[theEvent deviceDeltaY] * scrollFactor;
+deltaZ = [theEvent deviceDeltaZ];
-deltaZ = (int)[theEvent deviceDeltaZ] * scrollFactor;
+} else {
-} else { // carbonEventKind == kEventMouseWheelMoved
+// carbonEventKind == kEventMouseWheelMoved
-// Mouse wheel deltas seem to tick in at increments of 0.1.
+// Remove acceleration, and use either -120 or 120 as delta:
-// Qt widgets expect the delta to be a multiple of 120.
+deltaX = qBound(-120, int([theEvent deltaX] * 10000), 120);
-const int scrollFactor = 10 * 120;
+deltaY = qBound(-120, int([theEvent deltaY] * 10000), 120);
-deltaX = [theEvent deltaX] * scrollFactor;
+deltaZ = qBound(-120, int([theEvent deltaZ] * 10000), 120);
-deltaY = [theEvent deltaY] * scrollFactor;
-deltaZ = [theEvent deltaZ] * scrollFactor;
 }
 if (deltaX != 0) {
 QWheelEvent qwe(qlocal, qglobal, deltaX, buttons, keyMods, Qt::Horizontal);
 qt_sendSpontaneousEvent(widgetToGetMouse, &qwe);
 - (void)touchesCancelledWithEvent:(NSEvent *)event;
 {
 bool all = qwidget->testAttribute(Qt::WA_TouchPadAcceptSingleTouchEvents);
 qt_translateRawTouchEvent(qwidget, QTouchEvent::TouchPad, QCocoaTouch::getCurrentTouchPointList(event, all));
 }
+#endif // MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6
 - (void)magnifyWithEvent:(NSEvent *)event;
 {
 if (!QApplicationPrivate::tryModalHelper(qwidget, 0))
 return;
 qNGEvent.gestureType = QNativeGestureEvent::GestureEnd;
 NSPoint p = [[event window] convertBaseToScreen:[event locationInWindow]];
 qNGEvent.position = flipPoint(p).toPoint();
 qt_sendSpontaneousEvent(qwidget, &qNGEvent);
 }
-#endif // MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6
 - (void)frameDidChange:(NSNotification *)note
 {
 Q_UNUSED(note);
 if (qwidget->isWindow())
 offset:mouseOffset
 event:dndParams.theEvent
 pasteboard:pboard
 source:dndParams.view
 slideBack:YES];
+// reset the implicit grab widget when drag ends because we will not
+// receive the mouse release event when DND is active.
+qt_button_down = 0;
 [dndParams.view release];
 [image release];
 dragPrivate()->executed_action = Qt::IgnoreAction;
 object = 0;
-Qt::DropAction performedAction(qt_mac_mapNSDragOperation(dndParams.performedAction));
+Qt::DropAction performedAction(qt_mac_mapNSDragOperation(qMacDnDParams()->performedAction));
 // do post drag processing, if required.
 if(performedAction != Qt::IgnoreAction) {
 // check if the receiver points us to a file location.
 // if so, we need to do the file copy/move ourselves.
 QCFType<CFURLRef> pasteLocation = 0;

changeset 3	41300fa6a67c
parent 0	1918ee327afb
child 4	3b1da2848fc7