Self made scroll was replaced

* QAbstractKineticScroller is used when built for Maemo5

* QGraphicsView's drag mode is set to ScrollHandDrag
  for other devices

diff --git a/src/map/mapview.cpp b/src/map/mapview.cpp
index 8f457e0..7eb3195 100644 (file)
--- a/src/map/mapview.cpp
+++ b/src/map/mapview.cpp
@@ -28,15 +28,34 @@
     #include <QGLWidget>
 #endif // Q_WS_MAEMO_5
 
+#ifdef Q_WS_MAEMO_5
+    #include <QAbstractKineticScroller>
+#endif // Q_WS_MAEMO_5
+
 #include "common.h"
 #include "mapview.h"
 
 MapView::MapView(QWidget *parent) : QGraphicsView(parent)
 {
+/**
+  * Use OpenGL for desktop to gain some performance in map view.
+  * OpenGL can't be used in scratchbox.
+  */
 #ifndef Q_WS_MAEMO_5
-    // use opengl for desktop to gain some performance in map view
-    // opengl can't be used in scrathbox
     setViewport(new QGLWidget);
+#endif // !Q_WS_MAEMO_5
+
+/**
+  * Use kinetic scrolling for Maemo5 and QGraphicsViews drag mode
+  * ScrollHandDrag for other environments
+  */
+#ifdef Q_WS_MAEMO_5
+    QAbstractKineticScroller *scroller = property("kineticScroller")
+                                         .value<QAbstractKineticScroller *>();
+    if (scroller)
+        scroller->setEnabled(true);
+#else
+    setDragMode(QGraphicsView::ScrollHandDrag);
 #endif // Q_WS_MAEMO_5
 
     setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
@@ -82,21 +101,28 @@ qreal MapView::currentScale()
     return currentTransform.m11();
 }
 
-void MapView::mouseMoveEvent(QMouseEvent *event)
+void MapView::scrollContentsBy (int dx, int dy)
 {
-    m_scenePosition += m_mousePosition - mapToScene(event->pos());
-
-    emit viewScrolled(m_scenePosition);
-    //qDebug() << __PRETTY_FUNCTION__ << "m_scenePosition" << m_scenePosition;
+    qDebug() << __PRETTY_FUNCTION__ << "dx:" << dx << "dy:" << dy;
 
-    m_mousePosition = mapToScene(event->pos());
+    QGraphicsView::scrollContentsBy(dx, dy);
 }
 
-void MapView::mousePressEvent(QMouseEvent *event)
-{
-    m_mousePosition = mapToScene(event->pos());
-    m_scenePosition = mapToScene(width() / 2 - 1, height() / 2 - 1);
-}
+//void MapView::mouseMoveEvent(QMouseEvent *event)
+//{
+//    m_scenePosition += m_mousePosition - mapToScene(event->pos());
+//
+//    emit viewScrolled(m_scenePosition);
+//    //qDebug() << __PRETTY_FUNCTION__ << "m_scenePosition" << m_scenePosition;
+//
+//    m_mousePosition = mapToScene(event->pos());
+//}
+//
+//void MapView::mousePressEvent(QMouseEvent *event)
+//{
+//    m_mousePosition = mapToScene(event->pos());
+//    m_scenePosition = mapToScene(width() / 2 - 1, height() / 2 - 1);
+//}
 
 
 void MapView::centerToSceneCoordinates(QPointF sceneCoordinate)

diff --git a/src/map/mapview.h b/src/map/mapview.h
index fda5892..d92a4d2 100644 (file)
--- a/src/map/mapview.h
+++ b/src/map/mapview.h
@@ -27,6 +27,7 @@
 /**
 * @brief Map view widget
 *
+* QAbstractKineticScroller is enabled when built for Maemo5.
 * @author Sami Rämö - sami.ramo (at) ixonos.com
 */
 class MapView : public QGraphicsView
@@ -40,6 +41,9 @@ public:
     */
     MapView(QWidget *parent = 0);
 
+protected:
+    void scrollContentsBy(int dx, int dy);
+
 private:
     //
     /**
@@ -87,7 +91,7 @@ private slots:
     * signal and doesn't actually scroll the view.
     * @param event Mouse event
     */
-    void mouseMoveEvent(QMouseEvent *event);
+//    void mouseMoveEvent(QMouseEvent *event);
 
     /**
     * @brief Slot for mouse press events
@@ -95,7 +99,7 @@ private slots:
     * Saves inial values for mouse and scene location for dragging view.
     * @param event Mouse event
     */
-    void mousePressEvent(QMouseEvent *event);
+//    void mousePressEvent(QMouseEvent *event);
 
     /**
     * @brief Timer events for smooth zoom effect