X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fsmallruler.cpp;h=1f0dcfe18b332071b0d21b70a59b5e003c9c6e3b;hb=97c37bedc4c49d2362696e8ef675e7b67d541d48;hp=89d876d8cc7cbdc3305254d9f2448c31e5faf29a;hpb=ce68de86827a11cd0dc96465fba021b2f7ceea55;p=kdenlive

diff --git a/src/smallruler.cpp b/src/smallruler.cpp
index 89d876d8..1f0dcfe1 100644
--- a/src/smallruler.cpp
+++ b/src/smallruler.cpp
@@ -28,14 +28,17 @@
 #include <QMouseEvent>
 #include <QStylePainter>
 
+#define SEEK_INACTIVE (-1)
 
-SmallRuler::SmallRuler(MonitorManager *manager, QWidget *parent) :
+
+SmallRuler::SmallRuler(MonitorManager *manager, Render *render, QWidget *parent) :
         QWidget(parent)
         ,m_cursorFramePosition(0)
         ,m_scale(1)
         ,m_maxval(25)
         ,m_manager(manager)
-        ,m_overCursor(false)
+	,m_render(render)
+	,m_lastSeekPosition(SEEK_INACTIVE)
 {
     m_zoneStart = 10;
     m_zoneEnd = 60;
@@ -46,6 +49,7 @@ SmallRuler::SmallRuler(MonitorManager *manager, QWidget *parent) :
     setMinimumHeight(10);
 }
 
+
 void SmallRuler::adjustScale(int maximum)
 {
     m_maxval = maximum;
@@ -62,10 +66,23 @@ void SmallRuler::adjustScale(int maximum)
         m_small = 30 * 25;
         m_medium = 60 * 25;
     }
-    m_cursorPosition = m_cursorFramePosition * m_scale;
     updatePixmap();
 }
 
+void SmallRuler::setZoneStart()
+{
+    int pos = m_render->requestedSeekPosition;
+    if (pos == SEEK_INACTIVE) pos = m_render->seekFramePosition();
+    setZone(pos, -1);
+}
+
+void SmallRuler::setZoneEnd()
+{
+    int pos = m_render->requestedSeekPosition;
+    if (pos == SEEK_INACTIVE) pos = m_render->seekFramePosition();
+    setZone(-1, pos);
+}
+
 void SmallRuler::setZone(int start, int end)
 {
     if (start != -1) {
@@ -111,37 +128,22 @@ void SmallRuler::mousePressEvent(QMouseEvent * event)
         emit zoneChanged(QPoint(m_zoneStart, m_zoneEnd));
         updatePixmap();
 
-    } else emit seekRenderer((int) pos);
-}
-
-void SmallRuler::leaveEvent( QEvent * event )
-{
-    Q_UNUSED(event);
-    if (m_overCursor) {
-        m_overCursor = false;
-        update();
+    } else {
+	m_render->seekToFrame(pos);
+	m_lastSeekPosition = pos;
+	update();
     }
 }
 
+
 // virtual
 void SmallRuler::mouseMoveEvent(QMouseEvent * event)
 {
     const int pos = event->x() / m_scale;
-    if (event->button() == Qt::NoButton) {
-        if (qAbs(pos * m_scale - m_cursorPosition) < 6) {
-            if (!m_overCursor) {
-                m_overCursor = true;
-                update();
-            }
-        }
-        else if (m_overCursor) {
-            m_overCursor = false;
-            update();
-        }
-    }
     if (event->buttons() & Qt::LeftButton) {
-        m_overCursor = true;
-        emit seekRenderer((int) pos);
+	m_render->seekToFrame(pos);
+	m_lastSeekPosition = pos;
+	update();
     }
     else {
         if (qAbs((pos - m_zoneStart) * m_scale) < 4) {
@@ -154,23 +156,27 @@ void SmallRuler::mouseMoveEvent(QMouseEvent * event)
     }
 }
 
+void SmallRuler::refreshRuler()
+{
+    m_lastSeekPosition = SEEK_INACTIVE;
+    update();
+}
+
 bool SmallRuler::slotNewValue(int value)
 {
     if (value == m_cursorFramePosition) return false;
+    if (value == m_lastSeekPosition) m_lastSeekPosition = SEEK_INACTIVE;
     m_cursorFramePosition = value;
-    int oldPos = m_cursorPosition;
+    /*int oldPos = m_cursorPosition;
     m_cursorPosition = value * m_scale;
     const int offset = 6;
     const int x = qMin(oldPos, m_cursorPosition);
     const int w = qAbs(oldPos - m_cursorPosition);
-    update(x - offset, 4, w + 2 * offset, 6);
+    update(x - offset, 0, w + 2 * offset, height());*/
+    update();
     return true;
 }
 
-int SmallRuler::position() const
-{
-    return m_cursorFramePosition;
-}
 
 //virtual
 void SmallRuler::resizeEvent(QResizeEvent *)
@@ -182,6 +188,7 @@ void SmallRuler::updatePixmap()
 {
     m_pixmap = QPixmap(width(), height());
     m_pixmap.fill(palette().window().color());
+    m_lastSeekPosition = SEEK_INACTIVE;
     QPainter p(&m_pixmap);
     double f, fend;
 
@@ -224,13 +231,18 @@ void SmallRuler::paintEvent(QPaintEvent *e)
     p.setClipRect(r);
     p.drawPixmap(QPointF(), m_pixmap);
 
+    int cursorPos = m_cursorFramePosition * m_scale;
     // draw pointer
     QPolygon pa(3);
-    pa.setPoints(3, m_cursorPosition - 6, 10, m_cursorPosition + 6, 10, m_cursorPosition/*+0*/, 4);
-    if (m_overCursor) p.setBrush(palette().highlight());
-    else p.setBrush(palette().text().color());
+    pa.setPoints(3, cursorPos - 6, 10, cursorPos + 6, 10, cursorPos/*+0*/, 4);
+    p.setBrush(palette().text());
     p.setPen(Qt::NoPen);
     p.drawPolygon(pa);
+
+    // Draw seeking pointer
+    if (m_lastSeekPosition != SEEK_INACTIVE && m_lastSeekPosition != m_cursorFramePosition) {
+	p.fillRect(m_lastSeekPosition * m_scale - 1, 0, 3, height(), palette().highlight());
+    }
 }
 
 void SmallRuler::updatePalette()