X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fkeyframehelper.cpp;h=20c716e77c73d3669e7bd2be4fd337a3062a45ae;hb=193e14dd6e4c0be842951f43641a82aa81768d2e;hp=09a2235b676d11511e0210e2cb39710681ab751d;hpb=c51ed39f71890afaafde27559aeea0c2fd649f34;p=kdenlive

diff --git a/src/keyframehelper.cpp b/src/keyframehelper.cpp
index 09a2235b..20c716e7 100644
--- a/src/keyframehelper.cpp
+++ b/src/keyframehelper.cpp
@@ -19,10 +19,12 @@
 
 
 #include "keyframehelper.h"
+#include "kdenlivesettings.h"
 #include "definitions.h"
 
 #include <KDebug>
 #include <KGlobalSettings>
+#include <KColorScheme>
 
 #include <QMouseEvent>
 #include <QStylePainter>
@@ -34,26 +36,55 @@ KeyframeHelper::KeyframeHelper(QWidget *parent) :
         m_geom(NULL),
         m_position(0),
         m_scale(0),
-        m_movingKeyframe(false)
+        m_movingKeyframe(false),
+        m_lineHeight(10),
+        m_drag(false),
+        m_hoverKeyframe(-1)
 {
     setFont(KGlobalSettings::toolBarFont());
+    setMouseTracking(true);
+    QPalette p = palette();
+    KColorScheme scheme(p.currentColorGroup(), KColorScheme::Window, KSharedConfig::openConfig(KdenliveSettings::colortheme()));
+    m_selected = scheme.decoration(KColorScheme::HoverColor).color();
+    m_keyframe = scheme.foreground(KColorScheme::LinkText).color();
+    m_keyframebg = scheme.shade(KColorScheme::MidShade);
 }
 
 // virtual
 void KeyframeHelper::mousePressEvent(QMouseEvent * event)
 {
-    if (m_geom != NULL && (event->y() < height() / 2) && event->button() == Qt::LeftButton) {
+    m_hoverKeyframe = -1;
+    if (event->button() == Qt::LeftButton) m_drag = true;
+    else {
+	QWidget::mousePressEvent(event);
+	return;
+    }
+    if (m_geom != NULL && (event->y() < m_lineHeight)) {
         // check if we want to move a keyframe
-        int mousePos = qMax((int)(event->x() / m_scale - 5), 0);
+        int mousePos = qMax((int)(event->x() / m_scale), 0);
         Mlt::GeometryItem item;
         if (m_geom->next_key(&item, mousePos) == 0) {
-            if (item.frame() - mousePos < 10) {
+            if (qAbs(item.frame() * m_scale - (int)(event->x())) < 4) {
                 m_movingItem.x(item.x());
                 m_movingItem.y(item.y());
                 m_movingItem.w(item.w());
                 m_movingItem.h(item.h());
                 m_movingItem.mix(item.mix());
-                m_geom->remove(item.frame());
+                m_movingItem.frame(item.frame());
+
+                while (!m_extraMovingItems.isEmpty()) {
+                    Mlt::GeometryItem *gitem = m_extraMovingItems.takeFirst();
+                    delete gitem;
+                }
+                for (int i = 0; i < m_extraGeometries.count(); i++) {
+                    Mlt::GeometryItem *item2 = new Mlt::GeometryItem();
+                    if (m_extraGeometries.at(i)->next_key(item, mousePos) == 0) {
+                        item2->x(item.x());
+                        item2->frame(item.frame());
+                        m_extraMovingItems.append(item2);
+                    }
+                }
+                
                 m_dragStart = event->pos();
                 m_movingKeyframe = true;
                 return;
@@ -68,28 +99,84 @@ void KeyframeHelper::mousePressEvent(QMouseEvent * event)
 // virtual
 void KeyframeHelper::mouseMoveEvent(QMouseEvent * event)
 {
+    if (!m_drag) {
+        if (m_geom != NULL && (event->y() < m_lineHeight)) {
+            // check if we want to move a keyframe
+            int mousePos = qMax((int)(event->x() / m_scale), 0);
+            Mlt::GeometryItem item;
+            if (m_geom->next_key(&item, mousePos) == 0) {
+                if (qAbs(item.frame() * m_scale - (int)(event->x())) < 4) {
+                    if (m_hoverKeyframe == item.frame()) return;
+                    m_hoverKeyframe = item.frame();
+                    setCursor(Qt::PointingHandCursor);
+                    update();
+                    event->accept();
+                    return;
+                }
+            }
+        }
+        if (m_hoverKeyframe != -1) {
+            m_hoverKeyframe = -1;
+            setCursor(Qt::ArrowCursor);
+            update();
+        }
+        event->accept();
+	return;
+    }
     if (m_movingKeyframe) {
-        if (!m_dragStart.isNull() && (event->pos() - m_dragStart).manhattanLength() < QApplication::startDragDistance()) return;
-        m_dragStart = QPoint();
-        int pos = qMax(0, (int)(event->x() / m_scale));
-        pos = qMin(m_length, pos);
+        if (!m_dragStart.isNull()) {
+            if ((event->pos() - m_dragStart).manhattanLength() < QApplication::startDragDistance()) return;
+            m_dragStart = QPoint();
+            m_geom->remove(m_movingItem.frame());
+            for (int i = 0; i < m_extraGeometries.count(); i++)
+                m_extraGeometries[i]->remove(m_movingItem.frame());
+        }
+        int pos = qBound(0, (int)(event->x() / m_scale), frameLength);
+        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);
+        }
         update();
         return;
     }
     m_position = event->x() / m_scale;
     m_position = qMax(0, m_position);
-    m_position = qMin(m_length, m_position);
+    m_position = qMin(frameLength, m_position);
     emit positionChanged(m_position);
     update();
 }
 
+void KeyframeHelper::mouseDoubleClickEvent(QMouseEvent * event)
+{
+    if (m_geom != NULL && event->button() == Qt::LeftButton) {
+        // check if we want to move a keyframe
+        int mousePos = qMax((int)(event->x() / m_scale - 5), 0);
+        Mlt::GeometryItem item;
+        if (m_geom->next_key(&item, mousePos) == 0 && item.frame() - mousePos < 10) {
+            // There is already a keyframe close to mouse click
+            emit removeKeyframe(item.frame());
+            return;
+        }
+        // add new keyframe
+        emit addKeyframe((int)(event->x() / m_scale));
+    }
+}
+
 // virtual
 void KeyframeHelper::mouseReleaseEvent(QMouseEvent * event)
 {
+    m_drag = false;
+    m_hoverKeyframe = -1;
+    setCursor(Qt::ArrowCursor);
     if (m_movingKeyframe) {
         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));
+        }
+        
         emit keyframeMoved(m_position);
         return;
     }
@@ -99,10 +186,12 @@ void KeyframeHelper::mouseReleaseEvent(QMouseEvent * event)
 // virtual
 void KeyframeHelper::wheelEvent(QWheelEvent * e)
 {
-    if (e->delta() < 0) m_position = m_position - 1;
-    else m_position = m_position + 1;
+    if (e->delta() < 0)
+        --m_position;
+    else
+        ++m_position;
     m_position = qMax(0, m_position);
-    m_position = qMin(m_length, m_position);
+    m_position = qMin(frameLength, m_position);
     emit positionChanged(m_position);
     update();
     /*    int delta = 1;
@@ -118,46 +207,62 @@ void KeyframeHelper::paintEvent(QPaintEvent *e)
     QStylePainter p(this);
     const QRectF clipRect = e->rect();
     p.setClipRect(clipRect);
-    m_scale = (double) width() / m_length;
+    m_scale = (double) width() / frameLength;
     if (m_geom != NULL) {
         int pos = 0;
-        p.setPen(QColor(255, 20, 20));
-        p.setBrush(QColor(255, 20, 20));
+        p.setPen(m_keyframe);
+        p.setBrush(m_keyframebg);
         Mlt::GeometryItem item;
         while (true) {
             if (m_geom->next_key(&item, pos) == 1) break;
             pos = item.frame();
+            if (pos == m_hoverKeyframe) {
+                p.setBrush(m_selected);
+            }
             int scaledPos = pos * m_scale;
             // draw keyframes
-            p.drawLine(scaledPos, 6, scaledPos, 10);
+            p.drawLine(scaledPos, 9, scaledPos, 15);
             // draw pointer
-            QPolygon pa(3);
-            pa.setPoints(3, scaledPos - 4, 0, scaledPos + 4, 0, scaledPos, 4);
+            QPolygon pa(4);
+            pa.setPoints(4,
+                         scaledPos,     0,
+                         scaledPos - 4, 4,
+                         scaledPos,     8,
+                         scaledPos + 4, 4);
             p.drawPolygon(pa);
+            //p.drawEllipse(scaledPos - 4, 0, 8, 8);
+            if (pos == m_hoverKeyframe) {
+                p.setBrush(m_keyframebg);
+            }
             //p.fillRect(QRect(scaledPos - 1, 0, 2, 15), QBrush(QColor(255, 20, 20)));
             pos++;
         }
+        
         if (m_movingKeyframe) {
+            p.setBrush(m_selected);
             int scaledPos = (int)(m_movingItem.frame() * m_scale);
             // draw keyframes
-            p.drawLine(scaledPos, 6, scaledPos, 10);
+            p.drawLine(scaledPos, 9, scaledPos, 15);
             // draw pointer
-            QPolygon pa(3);
-            pa.setPoints(3, scaledPos - 4, 0, scaledPos + 4, 0, scaledPos, 4);
+            QPolygon pa(5);
+            pa.setPoints(4,
+                         scaledPos,     0,
+                         scaledPos - 4, 4,
+                         scaledPos,     8,
+                         scaledPos + 4, 4);
             p.drawPolygon(pa);
+            p.setBrush(m_keyframe);
         }
     }
     p.setPen(palette().dark().color());
-    p.drawLine(clipRect.x(), 5, clipRect.right(), 5);
+    p.drawLine(clipRect.x(), m_lineHeight, clipRect.right(), m_lineHeight);
 
     // draw pointer
     QPolygon pa(3);
     const int cursor = m_position * m_scale;
-    pa.setPoints(3, cursor - 5, 11, cursor + 5, 11, cursor, 6);
+    pa.setPoints(3, cursor - 5, 16, cursor + 5, 16, cursor, 11);
     p.setBrush(palette().dark().color());
     p.drawPolygon(pa);
-
-
 }
 
 int KeyframeHelper::value() const
@@ -175,8 +280,17 @@ void KeyframeHelper::setValue(const int pos)
 void KeyframeHelper::setKeyGeometry(Mlt::Geometry *geom, const int length)
 {
     m_geom = geom;
-    m_length = length;
+    frameLength = length;
+    while (!m_extraGeometries.isEmpty()) {
+        Mlt::Geometry *geom = m_extraGeometries.takeFirst();
+        delete geom;
+    }
     update();
 }
 
+void KeyframeHelper::addGeometry(Mlt::Geometry *geom)
+{
+    m_extraGeometries.append(geom);
+}
+
 #include "keyframehelper.moc"