HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2188:ad6cfe65c3e1

fixed mouse event delta handling

sauimone -

r2188:ad6cfe65c3e1

parent child

Context file:

r2188:ad6cfe65c3e1

Collapse all files

src/legend/legendmarkeritem.cpp +6 -2

              void LegendMarkerItem::mouseMoved(QPointF delta)
              {
-                 m_marker->m_legend->d_ptr->setOffset(-delta.x(), -delta.y());
+                 qreal dx = m_marker->m_legend->d_ptr->offset().x() - delta.x();
+                 qreal dy = m_marker->m_legend->d_ptr->offset().y() - delta.y();
+                 m_marker->m_legend->d_ptr->setOffset(dx, dy);
              }
              void LegendMarkerItem::mouseReleased(QPointF delta)
              {
-                 m_marker->m_legend->d_ptr->setOffset(-delta.x(), -delta.y());
+                 qreal dx = m_marker->m_legend->d_ptr->offset().x() - delta.x();
+                 qreal dy = m_marker->m_legend->d_ptr->offset().y() - delta.y();
+                 m_marker->m_legend->d_ptr->setOffset(dx, dy);
              }
              #include "moc_legendmarkeritem_p.cpp"

src/legend/mouseeventhandler.cpp +7 -4

              QTCOMMERCIALCHART_BEGIN_NAMESPACE
              MouseEventHandler::MouseEventHandler() :
-                 m_pressedPos(0,0),
+                 m_lastPos(0,0),
                  m_state(Idle),
                  m_treshold(10)
              {
              void MouseEventHandler::handleMousePressEvent(QGraphicsSceneMouseEvent* event)
              {
-                 m_pressedPos = event->pos();
+                 m_lastPos = event->screenPos();
                  m_state = Pressed;
                  event->accept();
              }
              void MouseEventHandler::handleMouseMoveEvent(QGraphicsSceneMouseEvent* event)
              {
-                 QPointF delta = event->pos() - m_pressedPos;
+                 QPointF delta = event->screenPos() - m_lastPos;
                  switch (m_state) {
                  case Pressed: {
                      // calculate treshold. If enough, change to move state and send out move deltas.
                      if (qAbs(delta.x()) > m_treshold || qAbs(delta.y()) > m_treshold) {
                          m_state = Moved;
+                         m_lastPos = event->screenPos();
                          mouseMoved(delta);
                      }
                      event->accept();
                      break;
                  }
                  case Moved: {
+                     m_lastPos = event->screenPos();
                      mouseMoved(delta);
                      event->accept();
                      break;
              void MouseEventHandler::handleMouseReleaseEvent(QGraphicsSceneMouseEvent* event)
              {
-                 QPointF delta = event->pos() - m_pressedPos;
+                 QPointF delta = event->screenPos() - m_lastPos;
+                 m_lastPos = event->screenPos();
                  switch (m_state) {
                  case Pressed:

src/legend/mouseeventhandler_p.h +1 -1

                  void handleMouseReleaseEvent(QGraphicsSceneMouseEvent* event);
              private:
-                 QPointF m_pressedPos;
+                 QPointF m_lastPos;
                  State m_state;
                  qreal m_treshold;
              };

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages