Cleanup & fix painting of timeline ruler when seeking:

[kdenlive] / src / customtrackview.cpp

diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp
index 97de5adb1005815898f948175a8b9cc1d259ca6d..3678d454b630b14e7a21747a59c4cc5440b82a48 100644 (file)
--- a/src/customtrackview.cpp
+++ b/src/customtrackview.cpp
@@ -3348,22 +3348,8 @@ void CustomTrackView::deleteClip(const QString &clipId)
 
 void CustomTrackView::seekCursorPos(int pos)
 {
-    int current = m_document->renderer()->requestedSeekPosition;
-    int playhead = m_document->renderer()->seekFramePosition();
-    int min;
-    int max;
-    if (current != SEEK_INACTIVE) {
-       min = qMin(pos, playhead);
-       min = qMin (min, current) - 5;
-       max = qMax(pos, playhead);
-       max = qMax(max, current) + 5;
-    }
-    else {
-       min = qMin(pos, playhead) - 5;
-       max = qMax(pos, playhead) + 5;
-    }
     m_document->renderer()->seek(pos);
-    emit updateRuler(min, max);
+    emit updateRuler();
 }
 
 int CustomTrackView::seekPosition() const
@@ -3380,6 +3366,7 @@ void CustomTrackView::setCursorPos(int pos, bool seek)
        m_cursorLine->setPos(m_cursorPos, 0);
        if (m_autoScroll) checkScrolling();
     }
+    else emit updateRuler();
 }
 
 void CustomTrackView::updateCursorPos()
@@ -3395,26 +3382,14 @@ int CustomTrackView::cursorPos()
 void CustomTrackView::moveCursorPos(int delta)
 {
     int currentPos = m_document->renderer()->requestedSeekPosition;
-    int actualPos = m_document->renderer()->seekPosition().frames(m_document->fps());
-    int min;
-    int max;
     if (currentPos == SEEK_INACTIVE) {
-       currentPos = actualPos + delta;
-       if (currentPos < 0) currentPos = 0;
-       min = qMin(actualPos, currentPos) - 5;
-       max = qMax(actualPos, currentPos) + 5;
+       currentPos = m_document->renderer()->seekPosition().frames(m_document->fps()) + delta;
     }
     else {
-       min = qMin(currentPos, currentPos + delta);
-       min = qMin (min, actualPos) - 5;
-       max = qMax(currentPos, currentPos + delta);
-       max = qMax(max, actualPos) + 5;
        currentPos += delta;
-       if (currentPos < 0) currentPos = 0;
     }
-
-    m_document->renderer()->seek(currentPos);
-    emit updateRuler(min, max);
+    m_document->renderer()->seek(qMax(0, currentPos));
+    emit updateRuler();
 }
 
 void CustomTrackView::initCursorPos(int pos)
@@ -7246,8 +7221,7 @@ void CustomTrackView::slotGotFilterJobResults(const QString &/*id*/, int startPo
         EditEffectCommand *command = new EditEffectCommand(this, m_document->tracksCount() - clip->track(), clip->startPos(), effect, newEffect, clip->selectedEffectIndex(), true, true);
         m_commandStack->push(command);
         emit clipItemSelected(clip);
-    }
-    
+    }    
 }