comparison src/panner.cpp @ 400:07eaf4e6003a

Merge from branch "item_appearance_adjustments"

 public:
     friend class Panner;
 };
 
 Panner::Panner() :
-    m_clicked(false)
+    m_clicked(false),
+    m_moved(false)
 {
     setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
     setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
     setOptimizationFlags(QGraphicsView::DontSavePainterState |
                          QGraphicsView::IndirectPainting);

     if (e->button() != Qt::LeftButton) {
         QGraphicsView::mouseDoubleClickEvent(e);
         return;
     }
     m_clicked = true;
+    m_moved = false;
     m_clickedRect = m_pannedRect;
     m_clickedPoint = e->pos();
 }
 
 void

 {
     if (!m_clicked) return;
     QPointF cp = mapToScene(m_clickedPoint);
     QPointF mp = mapToScene(e->pos());
     QPointF delta = mp - cp;
+    if (!m_moved) {
+        if ((m_clickedPoint - e->pos()).manhattanLength() > 2) {
+            m_moved = true;
+        } else {
+            return;
+        }
+    }
     QRectF nr = m_clickedRect;
     nr.translate(delta);
     m_pannedRect = nr;
     emit pannedRectChanged(m_pannedRect);
     viewport()->update();

         QGraphicsView::mouseDoubleClickEvent(e);
         return;
     }
 
     if (m_clicked) {
-        mouseMoveEvent(e);
+        if (m_moved) {
+            mouseMoveEvent(e);
+        } else {
+            moveTo(e->pos());
+        }
     }
 
     m_clicked = false;
     viewport()->update();
 }

 void
 Panner::moveTo(QPoint p)
 {
     QPointF sp = mapToScene(p);
     QRectF nr = m_pannedRect;
-    double d = sp.x() - nr.center().x();
-    nr.translate(d, 0);
+    double dx = sp.x() - nr.center().x();
+    double dy = sp.y() - nr.center().y();
+    nr.translate(dx, dy);
     slotSetPannedRect(nr);
     emit pannedRectChanged(m_pannedRect);
     viewport()->update();
 }