Fixes: NB#182815 - Pannable widget is not transparent wrt. passing focus to child widgets

RevBy: Jarno Malmari, Michael Hasselmann, Dominik Kapusta
Details: This patch completely removes mouse event replaying functionality
in the pannable widget and moves necessary pieces to mscene. This should allow
better focus handling in the scene and also should remove all crashes related
to mouse event being bounced between pannable widgets when two of them are
placed on the scene.

It also introduces one new method, an overloaded version of grabGesture,
which can be used to control the cancel event handling in libmeegotouch
applications. See documentation of MWidget::grabGesture for details.

1 files changed, 11 insertions, 63 deletions

diff --git a/src/corelib/widgets/mpannablewidget_p.h b/src/corelib/widgets/mpannablewidget_p.h
index 6129623b..b853783a 100644
--- a/src/corelib/widgets/mpannablewidget_p.h
+++ b/src/corelib/widgets/mpannablewidget_p.h
@@ -37,16 +37,11 @@ class MPannableWidgetGlass;
 class MPannableWidgetGlass : public MWidget
 {
 public:
-    MPannableWidgetGlass(QGraphicsItem *parent = 0);
-    virtual ~MPannableWidgetGlass();
+    MPannableWidgetGlass(MPannableWidget *pannableWidget = 0);
 
     virtual QRectF boundingRect() const;
 
     virtual void mousePressEvent(QGraphicsSceneMouseEvent *event);
-    virtual void mouseMoveEvent(QGraphicsSceneMouseEvent *event);
-    virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
-    virtual void timerEvent(QTimerEvent* event);
-    virtual void cancelEvent(MCancelEvent *event);
     virtual void tapAndHoldGestureEvent(QGestureEvent *event, QTapAndHoldGesture *gesture);
 
 protected:
@@ -61,67 +56,20 @@ public:
     explicit MPannableWidgetPrivate();
     virtual ~MPannableWidgetPrivate();
 
-    QGraphicsSceneMouseEvent  pressEvent;
 
-    MPhysics2DPanning *physics;
-    MPannableWidgetGlass *glass;
-    QGraphicsItem *mouseGrabber;
-
-    struct resentItem {
-        QEvent::Type     type;
-        QPoint           screenPos;
-        Qt::MouseButton  button;
-    };
-
-    QList<struct resentItem> resentList;
-
-    int pressDeliveryTimerId;
-    bool panGestureCausedCancelEvent;
-public:
+    void init();
+    void resetPhysics();
+    void glassMousePressEvent(QGraphicsSceneMouseEvent *event);
 
-    /*!
-     * \brief Internal method necessary to correctly handle event positions.
-     */
-    void translateEventToItemCoordinates(const QGraphicsItem *srcItem,
-                                         const QGraphicsItem *destItem,
-                                         QGraphicsSceneMouseEvent *event);
+private:
 
-    /*!
-     * \brief Method used for resetting state of the physics engine.
-     */
-    void resetPhysics();
+    MPhysics2DPanning *physics;
+    MPannableWidgetGlass *glass;
 
-    /*!
-     * \brief Method used for resetting glass and mouse grabber.
-     */
-    void resetMouseGrabber();
-
-    /*!
-     * \brief Method used for delivering event to interested widget.
-     */
-    void deliverMouseEvent(QGraphicsSceneMouseEvent *event);
-
-    /*!
-     * \brief Method used for delivering initial mouse press. It will set
-     * the mouseGrabber if it is necessary at this point.
-     */
-    void deliverPressEvent();
-
-    /*!
-     * \brief Method used to start a timer which will trigger the delivery
-     * of initial mouse press event.
-     */
-    void initialPressStartTimer();
-
-    /*!
-     * \brief Method used for cancelling the mouse press delivery timer.
-     */
-    void initialPressStopTimer();
-
-    /*!
-     * \brief Method used for getting an enabled parent pannable widget.
-     */
-    MPannableWidget* parentPannableWidget();
+#ifdef UNIT_TEST
+    // Test unit is defined as a friend of production code to access private members
+    friend class Ut_MPannableWidget;
+#endif
 };
 
 #endif