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 0cf185b05a76c7eaccb4d8128ac5db60f5c3b46c..3673cbb191fb2d451fe2d7fe86795a467d2caf94 100644 (file)
--- a/src/smallruler.cpp
+++ b/src/smallruler.cpp
@@ -34,11 +34,11 @@
 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)
+       ,m_cursorColor(palette().text())
 {
     m_zoneStart = 10;
     m_zoneEnd = 60;
@@ -47,6 +47,7 @@ SmallRuler::SmallRuler(MonitorManager *manager, Render *render, QWidget *parent)
 
     setMouseTracking(true);
     setMinimumHeight(10);
+    adjustScale(m_maxval);
 }
 
 
@@ -128,24 +129,52 @@ 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)
+{
+    QWidget::leaveEvent(event);
+    if (m_cursorColor == palette().highlight()) {
+       m_cursorColor = palette().text();
+       update();
+    }
+}
+
 // virtual
 void SmallRuler::mouseMoveEvent(QMouseEvent * 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) {
+           // Mouse is over cursor
+           m_cursorColor = palette().highlight();
+           update();
+       }
+       else if (m_cursorColor == palette().highlight() && qAbs(pos - m_cursorFramePosition) * m_scale >= 7) {
+           m_cursorColor = palette().text();
+           update();
+       }
         if (qAbs((pos - m_zoneStart) * m_scale) < 4) {
             setToolTip(i18n("Zone start: %1", m_manager->timecode().getTimecodeFromFrames(m_zoneStart)));
         } else if (qAbs((pos - m_zoneEnd) * m_scale) < 4) {
@@ -154,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()
@@ -236,7 +266,7 @@ void SmallRuler::paintEvent(QPaintEvent *e)
     // draw pointer
     QPolygon pa(3);
     pa.setPoints(3, cursorPos - 6, 10, cursorPos + 6, 10, cursorPos/*+0*/, 4);
-    p.setBrush(palette().text());
+    p.setBrush(m_cursorColor);
     p.setPen(Qt::NoPen);
     p.drawPolygon(pa);