From: Jean-Baptiste Mardelle Date: Sun, 14 Oct 2012 16:32:13 +0000 (+0200) Subject: Fix clip effect stack not updated when dropping effect in a group, nicer timeline... X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=12bd13b246f3cf974339c619c62104ca10af3170;p=kdenlive Fix clip effect stack not updated when dropping effect in a group, nicer timeline painting --- diff --git a/src/abstractgroupitem.cpp b/src/abstractgroupitem.cpp index d94cfbca..eb3a14ed 100644 --- a/src/abstractgroupitem.cpp +++ b/src/abstractgroupitem.cpp @@ -136,18 +136,18 @@ void AbstractGroupItem::fixItemRect() // virtual void AbstractGroupItem::paint(QPainter *p, const QStyleOptionGraphicsItem *option, QWidget *) { - const double scale = option->matrix.m11(); QColor bgcolor(100, 100, 200, 100); QRectF bound = option->exposedRect.adjusted(0, 0, 1, 1); p->setClipRect(bound); - p->fillRect(option->exposedRect, bgcolor); + const QRectF mapped = p->worldTransform().mapRect(option->exposedRect); + p->setWorldMatrixEnabled(false); + p->setBrush(bgcolor); QPen pen = p->pen(); pen.setColor(QColor(200, 90, 90)); pen.setStyle(Qt::DashLine); pen.setWidthF(0.0); - //pen.setCosmetic(true); p->setPen(pen); - p->drawRect(boundingRect().adjusted(0, 0, - 1 / scale, 0)); + p->drawRoundedRect(mapped, 3, 3); } //virtual diff --git a/src/clipitem.cpp b/src/clipitem.cpp index 8df2212c..5d73dc42 100644 --- a/src/clipitem.cpp +++ b/src/clipitem.cpp @@ -60,7 +60,8 @@ ClipItem::ClipItem(DocClipBase *clip, ItemInfo info, double fps, double speed, i m_speed(speed), m_strobe(strobe), m_framePixelWidth(0), - m_limitedKeyFrames(false) + m_limitedKeyFrames(false), + m_isMainSelectedClip(false) { setZValue(2); m_effectList = EffectsList(true); @@ -768,29 +769,39 @@ void ClipItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *) { + QPalette palette = scene()->palette(); QColor paintColor; + QColor textColor; + QColor textBgColor; QPen framePen; if (parentItem()) paintColor = QColor(255, 248, 149); else paintColor = m_baseColor; if (isSelected() || (parentItem() && parentItem()->isSelected())) { + textColor = palette.highlightedText().color(); + textBgColor = palette.highlight().color(); paintColor = paintColor.darker(); - framePen.setColor(Qt::red); - framePen.setWidthF(2.0); + framePen.setColor(textBgColor); } else { + textColor = palette.text().color(); + textBgColor = palette.window().color(); + textBgColor.setAlpha(200); framePen.setColor(paintColor.darker()); } - const QRectF exposed = option->exposedRect; - painter->setClipRect(exposed); - painter->fillRect(exposed, paintColor); - painter->setWorldMatrixEnabled(false);; + const QRectF mappedExposed = painter->worldTransform().mapRect(exposed); const QRectF mapped = painter->worldTransform().mapRect(rect()); + painter->setWorldMatrixEnabled(false); + QPainterPath p; + p.addRect(mappedExposed); + QPainterPath q; + q.addRoundedRect(mapped.adjusted(0, 0, -0.5, 0), 3, 3); + painter->setClipPath(p.intersected(q)); + painter->setPen(Qt::NoPen); + painter->fillRect(mappedExposed, paintColor); + painter->setPen(paintColor.darker()); // draw thumbnails if (KdenliveSettings::videothumbnails() && !isAudioOnly()) { - QPen pen = painter->pen(); - pen.setColor(QColor(255, 255, 255, 150)); - painter->setPen(pen); if ((m_clipType == IMAGE || m_clipType == TEXT) && !m_startPix.isNull()) { const QPointF top = mapped.topRight() - QPointF(m_startPix.width() - 1, 0); painter->drawPixmap(top, m_startPix); @@ -827,7 +838,6 @@ void ClipItem::paint(QPainter *painter, QImage img; QPen pen(Qt::white); pen.setStyle(Qt::DotLine); - painter->setPen(pen); QList missing; for (int i = left; i <= right; i++) { img = m_clip->thumbProducer()->findCachedThumb(path + QString::number(i)); @@ -844,7 +854,6 @@ void ClipItem::paint(QPainter *painter, #endif } } - painter->setPen(Qt::black); } // draw audio thumbnails @@ -892,36 +901,38 @@ void ClipItem::paint(QPainter *painter, // Draw effects names if (!m_effectNames.isEmpty() && mapped.width() > 40) { QRectF txtBounding = painter->boundingRect(mapped, Qt::AlignLeft | Qt::AlignTop, m_effectNames); - QColor bgColor; + QColor bColor = palette.window().color(); + QColor tColor = palette.text().color(); + tColor.setAlpha(220); if (m_timeLine && m_timeLine->state() == QTimeLine::Running) { qreal value = m_timeLine->currentValue(); txtBounding.setWidth(txtBounding.width() * value); - bgColor.setRgb(50 + 200 *(1.0 - value), 50, 50, 100 + 50 * value); - } else bgColor.setRgb(50, 50, 90, 180); - - QPainterPath rounded; - rounded.moveTo(txtBounding.bottomRight()); - rounded.arcTo(txtBounding.right() - txtBounding.height() - 2, txtBounding.top() - txtBounding.height(), txtBounding.height() * 2, txtBounding.height() * 2, 270, 90); - rounded.lineTo(txtBounding.topLeft()); - rounded.lineTo(txtBounding.bottomLeft()); - painter->fillPath(rounded, bgColor); - painter->setPen(Qt::lightGray); - painter->drawText(txtBounding.adjusted(1, 0, 1, 0), Qt::AlignCenter, m_effectNames); + bColor.setAlpha(100 + 50 * value); + }; + + painter->setBrush(bColor); + painter->setPen(Qt::NoPen); + painter->drawRoundedRect(txtBounding.adjusted(-1, -2, 4, -1), 3, 3); + painter->setPen(tColor); + painter->drawText(txtBounding.adjusted(2, 0, 1, -1), Qt::AlignCenter, m_effectNames); } - const QRectF txtBounding2 = painter->boundingRect(mapped, Qt::AlignHCenter | Qt::AlignVCenter, ' ' + m_clipName + ' '); - painter->setBrush(framePen.color()); - painter->setPen(Qt::NoPen); - painter->drawRoundedRect(txtBounding2, 3, 3); + // Draw clip name + const QRectF txtBounding2 = painter->boundingRect(mapped, Qt::AlignRight | Qt::AlignTop, m_clipName + ' ').adjusted(0, -1, 0, -1); + painter->setPen(Qt::NoPen); + if (m_isMainSelectedClip) { + framePen.setColor(Qt::red); + textBgColor = Qt::red; + } + painter->fillRect(txtBounding2.adjusted(-3, 0, 0, 0), textBgColor); painter->setBrush(QBrush(Qt::NoBrush)); - + painter->setPen(textColor); if (m_videoOnly) { painter->drawPixmap(txtBounding2.topLeft() - QPointF(17, -1), m_videoPix); } else if (m_audioOnly) { painter->drawPixmap(txtBounding2.topLeft() - QPointF(17, -1), m_audioPix); } - painter->setPen(Qt::white); - painter->drawText(txtBounding2, Qt::AlignCenter, m_clipName); + painter->drawText(txtBounding2, Qt::AlignLeft, m_clipName); // draw markers @@ -945,7 +956,7 @@ void ClipItem::paint(QPainter *painter, painter->drawLine(l2); if (KdenliveSettings::showmarkers()) { framepos = rect().x() + pos.frames(m_fps); - const QRectF r1(framepos + 0.04, 10, rect().width() - framepos - 2, rect().height() - 10); + const QRectF r1(framepos + 0.04, rect().height()/3, rect().width() - framepos - 2, rect().height() / 2); const QRectF r2 = painter->worldTransform().mapRect(r1); const QRectF txtBounding3 = painter->boundingRect(r2, Qt::AlignLeft | Qt::AlignTop, ' ' + (*it).comment() + ' '); painter->setBrush(markerBrush); @@ -1002,13 +1013,10 @@ void ClipItem::paint(QPainter *painter, // draw clip border // expand clip rect to allow correct painting of clip border painter->setClipping(false); + painter->setRenderHint(QPainter::Antialiasing, true); + framePen.setWidthF(1.5); painter->setPen(framePen); - if (isSelected() || (parentItem() && parentItem()->isSelected())) { - painter->drawRect(mapped.adjusted(0.5, 0.5, -0.5, -0.5)); - } - else { - painter->drawRect(mapped.adjusted(0, 0, -0.5, 0)); - } + painter->drawRoundedRect(mapped.adjusted(0, 0, -0.5, -0.5), 3, 3); } @@ -2078,5 +2086,17 @@ void ClipItem::slotGotThumbsCache() update(); } +void ClipItem::setMainSelectedClip(bool selected) +{ + if (selected == m_isMainSelectedClip) return; + m_isMainSelectedClip = selected; + update(); +} + +bool ClipItem::isMainSelectedClip() +{ + return m_isMainSelectedClip; +} + #include "clipitem.moc" diff --git a/src/clipitem.h b/src/clipitem.h index ef81fe83..47434366 100644 --- a/src/clipitem.h +++ b/src/clipitem.h @@ -189,6 +189,10 @@ public: /** @brief Get a free index value for effect group. */ int nextFreeEffectGroupIndex() const; + /** @brief Set this clip as the main selected clip (or not). */ + void setMainSelectedClip(bool selected); + /** @brief Is this clip selected as the main clip. */ + bool isMainSelectedClip(); protected: //virtual void mouseMoveEvent(QGraphicsSceneMouseEvent * event); @@ -238,6 +242,8 @@ private: /** @brief Keyframes type can be "keyframe" or "simplekeyframe" which have to be painted differently. * True if keyframe type is "keyframe" */ bool m_limitedKeyFrames; + /** @brief True if this is the last clip the user selected */ + bool m_isMainSelectedClip; private slots: void slotGetStartThumb(); diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp index 93b4ef32..e97c46ad 100644 --- a/src/customtrackview.cpp +++ b/src/customtrackview.cpp @@ -980,27 +980,34 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) else if (dragGroup && dragGroup->isSelected()) itemSelected = true; - if (event->modifiers() == Qt::ControlModifier || itemSelected == false) { + if ((event->modifiers() == Qt::ControlModifier) || itemSelected == false) { if (event->modifiers() != Qt::ControlModifier) { resetSelectionGroup(false); m_scene->clearSelection(); // A refresh seems necessary otherwise in zoomed mode, some clips disappear viewport()->update(); - } else resetSelectionGroup(); + } else { + resetSelectionGroup(); + } dragGroup = NULL; if (m_dragItem->parentItem() && m_dragItem->parentItem()->type() == GROUPWIDGET) { dragGroup = static_cast (m_dragItem->parentItem()); } bool selected = !m_dragItem->isSelected(); - if (dragGroup) + /*if (dragGroup) dragGroup->setSelected(selected); - else + else*/ m_dragItem->setSelected(selected); - + if (selected == false) { + m_dragItem = NULL; + } groupSelectedItems(); - ClipItem *clip = static_cast (m_dragItem); - updateClipTypeActions(dragGroup == NULL ? clip : NULL); - m_pasteEffectsAction->setEnabled(m_copiedItems.count() == 1); + if (m_dragItem) { + ClipItem *clip = static_cast (m_dragItem); + updateClipTypeActions(dragGroup == NULL ? clip : NULL); + m_pasteEffectsAction->setEnabled(m_copiedItems.count() == 1); + } + else updateClipTypeActions(NULL); } if (collisionClip != NULL || m_dragItem == NULL) { @@ -1013,9 +1020,11 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) } // If clicked item is selected, allow move - if (event->modifiers() != Qt::ControlModifier && m_operationMode == NONE) QGraphicsView::mousePressEvent(event); + //if (!(event->modifiers() | Qt::ControlModifier) && m_operationMode == NONE) + QGraphicsView::mousePressEvent(event); - m_clickPoint = QPoint((int)(mapToScene(event->pos()).x() - m_dragItem->startPos().frames(m_document->fps())), (int)(event->pos().y() - m_dragItem->pos().y())); + if (m_dragItem) { + m_clickPoint = QPoint((int)(mapToScene(event->pos()).x() - m_dragItem->startPos().frames(m_document->fps())), (int)(event->pos().y() - m_dragItem->pos().y())); if (m_selectionGroup && m_dragItem->parentItem() == m_selectionGroup) { // all other modes break the selection, so the user probably wants to move it m_operationMode = MOVE; @@ -1026,6 +1035,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) } else m_operationMode = m_dragItem->operationMode(mapToScene(event->pos())); } + } else m_operationMode = NONE; m_controlModifier = (event->modifiers() == Qt::ControlModifier); // Update snap points @@ -1887,12 +1897,23 @@ void CustomTrackView::slotAddEffect(QDomElement effect, GenTime pos, int track) clearSelection(false); clip->setSelected(true); m_dragItem = clip; - emit clipItemSelected(clip); } + emit clipItemSelected(clip); break; } } } + else { + for (int i = 0; i < itemList.count(); i++) { + if (itemList.at(i)->type() == AVWIDGET) { + ClipItem *clip = static_cast(itemList.at(i)); + if (clip->isMainSelectedClip()) { + emit clipItemSelected(clip); + break; + } + } + } + } } else delete effectCommand; } @@ -3438,7 +3459,7 @@ void CustomTrackView::checkScrolling() void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { if (m_moveOpMode == SEEK) m_moveOpMode = NONE; - QGraphicsView::mouseReleaseEvent(event); + if (!m_controlModifier) QGraphicsView::mouseReleaseEvent(event); setViewportUpdateMode(QGraphicsView::MinimalViewportUpdate); #if QT_VERSION >= 0x040600 if (m_dragItem) m_dragItem->setGraphicsEffect(NULL); @@ -5555,7 +5576,9 @@ void CustomTrackView::drawBackground(QPainter * painter, const QRectF &rect) { painter->setClipRect(rect); QPen pen1 = painter->pen(); - pen1.setColor(palette().dark().color()); + QColor lineColor = palette().dark().color(); + lineColor.setAlpha(100); + pen1.setColor(lineColor); painter->setPen(pen1); double min = rect.left(); double max = rect.right(); diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index d7429b83..e80868fd 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -158,7 +158,8 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, const QString & m_jogShuttle(NULL), #endif m_findActivated(false), - m_stopmotion(NULL) + m_stopmotion(NULL), + m_mainClip(NULL) { qRegisterMetaType > (); qRegisterMetaType ("stringMap"); @@ -3367,6 +3368,11 @@ void MainWindow::customEvent(QEvent* e) void MainWindow::slotTimelineClipSelected(ClipItem* item, bool raise) { + if (item != m_mainClip) { + if (m_mainClip) m_mainClip->setMainSelectedClip(false); + if (item) item->setMainSelectedClip(true); + m_mainClip = item; + } m_effectStack->slotClipItemSelected(item); m_projectMonitor->slotSetSelectedClip(item); if (raise) diff --git a/src/mainwindow.h b/src/mainwindow.h index a7f1c2c7..7593c59a 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -318,7 +318,8 @@ private: StopmotionWidget *m_stopmotion; QTime m_timer; - + /** @brief The last selected clip in timeline. */ + ClipItem *m_mainClip; /** @brief Update statusbar stylesheet (in case of color theme change). */ void setStatusBarStyleSheet(const QPalette &p); diff --git a/src/transition.cpp b/src/transition.cpp index 27f66cd6..f10befc4 100644 --- a/src/transition.cpp +++ b/src/transition.cpp @@ -161,22 +161,26 @@ void Transition::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget */*widget*/) { - const QRectF exposed = option->exposedRect; - painter->setClipRect(exposed); + const QRectF exposed = painter->worldTransform().mapRect(option->exposedRect); const QRectF br = rect(); QPen framePen; + framePen.setWidthF(1.2); const QRectF mapped = painter->worldTransform().mapRect(br); - painter->fillRect(exposed, brush()); - QPointF p1(br.x(), br.y() + br.height() / 2 - 7); painter->setWorldMatrixEnabled(false); + QPainterPath p; + p.addRect(exposed); + QPainterPath q; + q.addRoundedRect(mapped.adjusted(0, 0, -1, -1), 3, 3); + painter->setClipPath(p.intersected(q)); + painter->fillRect(exposed, brush()); const QString text = m_name + (m_forceTransitionTrack ? "|>" : QString()); // Draw clip name if (isSelected() || (parentItem() && parentItem()->isSelected())) { - framePen.setColor(Qt::red); - framePen.setWidthF(2.0); + framePen.setColor(scene()->palette().highlight().color()); + framePen.setColor(Qt::red); } else { framePen.setColor(brush().color().darker()); @@ -194,7 +198,8 @@ void Transition::paint(QPainter *painter, // Draw frame painter->setPen(framePen); painter->setClipping(false); - painter->drawRect(mapped.adjusted(0, 0, -0.5, -0.5)); + painter->setRenderHint(QPainter::Antialiasing, true); + painter->drawRoundedRect(mapped.adjusted(0, 0, -0.5, -0.5), 3, 3); } int Transition::type() const