Merge branch 'map' of https://vcs.maemo.org/git/situare into map

[situare] / src / map / mapview.cpp

diff --git a/src/map/mapview.cpp b/src/map/mapview.cpp
index 8f457e0..fe86baf 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,31 +101,25 @@ 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__;
 
-    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);
+    QPoint centerInScene = mapToScene(frameRect().center()).toPoint();
+//    qDebug() << __PRETTY_FUNCTION__ << "centerInScene:" << centerInScene;
+    emit viewScrolled(centerInScene);
 }
 
-
-void MapView::centerToSceneCoordinates(QPointF sceneCoordinate)
+void MapView::centerToSceneCoordinates(QPoint sceneCoordinate)
 {
-    //qDebug() << __PRETTY_FUNCTION__ << "sceneCoordinate" << sceneCoordinate;
+//    qDebug() << __PRETTY_FUNCTION__ << "sceneCoordinate" << sceneCoordinate;
     centerOn(sceneCoordinate);
 }
 
 void MapView::resizeEvent(QResizeEvent *event)
 {
-    qDebug() << "Resize event: " << event->size();
+    //qDebug() << "Resize event: " << event->size();
     emit viewResized(event->size());
 }