Don't send several seek requests for same frame when seeking with monitor ruler

[kdenlive] / src / smallruler.cpp

diff --git a/src/smallruler.cpp b/src/smallruler.cpp
index 24a016dd30ee2d2aeac4ef09a3199ca34d7c55ff..3673cbb191fb2d451fe2d7fe86795a467d2caf94 100644 (file)
--- a/src/smallruler.cpp
+++ b/src/smallruler.cpp
@@ -34,8 +34,7 @@
 SmallRuler::SmallRuler(MonitorManager *manager, Render *render, QWidget *parent) :
         QWidget(parent)
         ,m_cursorFramePosition(0)
-        ,m_scale(1)
-        ,m_maxval(25)
+        ,m_maxval(2)
         ,m_manager(manager)
        ,m_render(render)
        ,m_lastSeekPosition(SEEK_INACTIVE)
@@ -48,6 +47,7 @@ SmallRuler::SmallRuler(MonitorManager *manager, Render *render, QWidget *parent)
 
     setMouseTracking(true);
     setMinimumHeight(10);
+    adjustScale(m_maxval);
 }
 
 
@@ -129,13 +129,21 @@ void SmallRuler::mousePressEvent(QMouseEvent * event)
         emit zoneChanged(QPoint(m_zoneStart, m_zoneEnd));
         updatePixmap();
 
-    } else {
+    } else if (pos != m_lastSeekPosition && pos != m_cursorFramePosition) {
        m_render->seekToFrame(pos);
        m_lastSeekPosition = pos;
        update();
     }
+    event->accept();
+}
+
+// virtual
+void SmallRuler::mouseReleaseEvent(QMouseEvent * event)
+{
+    event->accept();
 }
 
+
 // virtual
 void SmallRuler::leaveEvent(QEvent * event)
 {
@@ -149,12 +157,13 @@ void SmallRuler::leaveEvent(QEvent * event)
 // virtual
 void SmallRuler::mouseMoveEvent(QMouseEvent * event)
 {
-    QWidget::mouseMoveEvent(event);
     const int pos = event->x() / m_scale;
     if (event->buttons() & Qt::LeftButton) {
-       m_render->seekToFrame(pos);
-       m_lastSeekPosition = pos;
-       update();
+       if (pos != m_lastSeekPosition && pos != m_cursorFramePosition) {
+           m_render->seekToFrame(pos);
+           m_lastSeekPosition = pos;
+           update();
+       }
     }
     else {
        if (m_cursorColor == palette().text() && qAbs(pos - m_cursorFramePosition) * m_scale < 7) {
@@ -174,6 +183,7 @@ void SmallRuler::mouseMoveEvent(QMouseEvent * event)
             setToolTip(i18n("Zone duration: %1", m_manager->timecode().getTimecodeFromFrames(m_zoneEnd - m_zoneStart)));
         } else setToolTip(i18n("Position: %1", m_manager->timecode().getTimecodeFromFrames(pos)));
     }
+    event->accept();
 }
 
 void SmallRuler::refreshRuler()