X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fkeyframehelper.cpp;h=b0bbb391d4329f3d7b51096cdc88e9a33f59326b;hb=c3302003093710ee247ad84c0fe2ef3c579d417f;hp=05012a123a4a89924621efa2a3a5a1cf3240b7b5;hpb=3b63a37f9ee6286a570290c4ae18cae07f400cde;p=kdenlive

diff --git a/src/keyframehelper.cpp b/src/keyframehelper.cpp
index 05012a12..b0bbb391 100644
--- a/src/keyframehelper.cpp
+++ b/src/keyframehelper.cpp
@@ -33,15 +33,20 @@
 const int margin = 5;
 const int cursorWidth = 6;
 
+#define SEEK_INACTIVE (-1)
+
 KeyframeHelper::KeyframeHelper(QWidget *parent) :
-        QWidget(parent),
-        m_geom(NULL),
-        m_position(0),
-        m_scale(0),
-        m_movingKeyframe(false),
-        m_lineHeight(9),
-        m_drag(false),
-        m_hoverKeyframe(-1)
+    QWidget(parent)
+  , frameLength(1)
+  , m_geom(NULL)
+  , m_position(0)
+  , m_scale(0)
+  , m_movingKeyframe(false)
+  , m_movingItem()
+  , m_lineHeight(9)
+  , m_drag(false)
+  , m_hoverKeyframe(-1)
+  , m_seekPosition(SEEK_INACTIVE)
 {
     setFont(KGlobalSettings::toolBarFont());
     setMouseTracking(true);
@@ -57,8 +62,8 @@ void KeyframeHelper::mousePressEvent(QMouseEvent * event)
 {
     m_hoverKeyframe = -1;
     if (event->button() != Qt::LeftButton) {
-	QWidget::mousePressEvent(event);
-	return;
+        QWidget::mousePressEvent(event);
+        return;
     }
     int xPos = event->x() - margin;
     if (m_geom != NULL && (event->y() < m_lineHeight)) {
@@ -77,14 +82,16 @@ void KeyframeHelper::mousePressEvent(QMouseEvent * event)
 
                 while (!m_extraMovingItems.isEmpty()) {
                     Mlt::GeometryItem *gitem = m_extraMovingItems.takeFirst();
-                    delete gitem;
+                    if (gitem) delete gitem;
                 }
-                for (int i = 0; i < m_extraGeometries.count(); i++) {
-                    Mlt::GeometryItem *item2 = new Mlt::GeometryItem();
+                for (int i = 0; i < m_extraGeometries.count(); ++i) {
                     if (m_extraGeometries.at(i)->next_key(item, mousePos) == 0) {
+                        Mlt::GeometryItem *item2 = new Mlt::GeometryItem();
                         item2->x(item.x());
                         item2->frame(item.frame());
                         m_extraMovingItems.append(item2);
+                    } else {
+                        m_extraMovingItems.append(NULL);
                     }
                 }
                 
@@ -95,9 +102,21 @@ void KeyframeHelper::mousePressEvent(QMouseEvent * event)
         }
     }
     if (event->y() >= m_lineHeight && event->y() < height()) {
+        int seekRequest = xPos / m_scale;
         m_drag = true;
-        m_position = xPos / m_scale;
-        emit positionChanged(m_position);
+        if (seekRequest != m_position) {
+            m_seekPosition = seekRequest;
+            emit requestSeek(m_seekPosition);
+            update();
+        }
+    }
+}
+
+void KeyframeHelper::leaveEvent( QEvent * event )
+{
+    Q_UNUSED(event);
+    if (m_hoverKeyframe != -1) {
+        m_hoverKeyframe = -1;
         update();
     }
 }
@@ -108,10 +127,12 @@ void KeyframeHelper::mouseMoveEvent(QMouseEvent * event)
     int xPos = event->x() - margin;
     if (!m_drag) {
         int mousePos = qMax((int)(xPos / m_scale), 0);
-        if (qAbs(m_position * m_scale - xPos) < cursorWidth && event->y() >= m_lineHeight && event->y() < 17) {
+        if (qAbs(m_position * m_scale - xPos) < cursorWidth && event->y() >= m_lineHeight) {
             // Mouse over time cursor
-            m_hoverKeyframe = -2;
-            update();
+            if (m_hoverKeyframe != -2) {
+                m_hoverKeyframe = -2;
+                update();
+            }
             event->accept();
             return;
         }
@@ -135,30 +156,32 @@ void KeyframeHelper::mouseMoveEvent(QMouseEvent * event)
             update();
         }
         event->accept();
-	return;
+        return;
     }
     if (m_movingKeyframe) {
         if (!m_dragStart.isNull()) {
             if ((QPoint(xPos, event->y()) - m_dragStart).manhattanLength() < QApplication::startDragDistance()) return;
             m_dragStart = QPoint();
             m_geom->remove(m_movingItem.frame());
-            for (int i = 0; i < m_extraGeometries.count(); i++)
+            for (int i = 0; i < m_extraGeometries.count(); ++i)
                 m_extraGeometries[i]->remove(m_movingItem.frame());
         }
         int pos = qBound(0, (int)(xPos / m_scale), frameLength);
-        if (KdenliveSettings::snaptopoints() && qAbs(pos - m_position) < 5) pos = m_position;
+        if (KdenliveSettings::snaptopoints() && qAbs(pos - m_position) < 5)
+            pos = m_position;
         m_movingItem.frame(pos);
-        for (int i = 0; i < m_extraMovingItems.count(); i++) {
-            m_extraMovingItems[i]->frame(pos);
+        for (int i = 0; i < m_extraMovingItems.count(); ++i) {
+            if (m_extraMovingItems.at(i))
+                m_extraMovingItems[i]->frame(pos);
         }
         update();
         return;
     }
-    m_position = xPos / m_scale;
-    m_position = qMax(0, m_position);
-    m_position = qMin(frameLength, m_position);
+    m_seekPosition = (int) (xPos / m_scale);
+    m_seekPosition = qMax(0, m_seekPosition);
+    m_seekPosition = qMin(frameLength, m_seekPosition);
     m_hoverKeyframe = -2;
-    emit positionChanged(m_position);
+    emit requestSeek(m_seekPosition);
     update();
 }
 
@@ -189,8 +212,9 @@ void KeyframeHelper::mouseReleaseEvent(QMouseEvent * event)
         m_geom->insert(m_movingItem);
         m_movingKeyframe = false;
 
-        for (int i = 0; i < m_extraGeometries.count(); i++) {
-            m_extraGeometries[i]->insert(m_extraMovingItems.at(i));
+        for (int i = 0; i < m_extraGeometries.count(); ++i) {
+            if (m_extraMovingItems.at(i))
+                m_extraGeometries[i]->insert(m_extraMovingItems.at(i));
         }
         
         emit keyframeMoved(m_position);
@@ -208,7 +232,7 @@ void KeyframeHelper::wheelEvent(QWheelEvent * e)
         ++m_position;
     m_position = qMax(0, m_position);
     m_position = qMin(frameLength, m_position);
-    emit positionChanged(m_position);
+    emit requestSeek(m_position);
     update();
     /*    int delta = 1;
         if (e->modifiers() == Qt::ControlModifier) delta = m_timecode.fps();
@@ -273,14 +297,17 @@ void KeyframeHelper::paintEvent(QPaintEvent *e)
     p.setPen(palette().dark().color());
     p.drawLine(margin, m_lineHeight, width() - margin - 1, m_lineHeight);
     p.drawLine(margin, m_lineHeight - 3, margin, m_lineHeight + 3);
-    p.drawLine(width() - margin - 1, m_lineHeight - 3, width() - margin - 1, m_lineHeight + 3);
+    p.drawLine(width() - margin, m_lineHeight - 3, width() - margin, m_lineHeight + 3);
 
     // draw pointer
+    if (m_seekPosition != SEEK_INACTIVE) {
+        p.fillRect(margin + m_seekPosition * m_scale - 1, 0, 3, height(), palette().dark());
+    }
     QPolygon pa(3);
     const int cursor = margin + m_position * m_scale;
     pa.setPoints(3, cursor - cursorWidth, 16, cursor + cursorWidth, 16, cursor, 10);
     if (m_hoverKeyframe == -2)
-        p.setBrush(m_selected);
+        p.setBrush(palette().highlight());
     else
         p.setBrush(palette().dark().color());
     p.drawPolygon(pa);
@@ -293,7 +320,11 @@ int KeyframeHelper::value() const
 
 void KeyframeHelper::setValue(const int pos)
 {
-    if (pos == m_position || m_geom == NULL) return;
+    if (pos == m_position || m_geom == NULL)
+        return;
+    if (pos == m_seekPosition) {
+        m_seekPosition = SEEK_INACTIVE;
+    }
     m_position = pos;
     update();
 }
@@ -301,11 +332,7 @@ void KeyframeHelper::setValue(const int pos)
 void KeyframeHelper::setKeyGeometry(Mlt::Geometry *geom, const int length)
 {
     m_geom = geom;
-    frameLength = length;
-    while (!m_extraGeometries.isEmpty()) {
-        Mlt::Geometry *geom = m_extraGeometries.takeFirst();
-        delete geom;
-    }
+    frameLength = qMax(1, length);
     update();
 }