X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fclipitem.cpp;h=5d73dc42241e73cb13d83c63d1093a1887ef86e8;hb=12bd13b246f3cf974339c619c62104ca10af3170;hp=e00b59b4c06707616a961470c565a97cca0de3e5;hpb=be563b527d022b673971f83ed35975fc81d5acbd;p=kdenlive diff --git a/src/clipitem.cpp b/src/clipitem.cpp index e00b59b4..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); } @@ -1026,8 +1034,8 @@ OPERATIONTYPE ClipItem::operationMode(QPointF pos) } QRectF rect = sceneBoundingRect(); int addtransitionOffset = 10; - // Don't allow add transition if track height is very small - if (rect.height() < 30) addtransitionOffset = 0; + // Don't allow add transition if track height is very small. No transitions for audio only clips + if (rect.height() < 30 || isAudioOnly() || m_clipType == AUDIO) addtransitionOffset = 0; if (qAbs((int)(pos.x() - (rect.x() + m_startFade))) < maximumOffset && qAbs((int)(pos.y() - rect.y())) < 6) { return FADEIN; @@ -1060,7 +1068,8 @@ void ClipItem::resetFrameWidth(int width) QList ClipItem::snapMarkers() const { QList < GenTime > snaps; - QList < GenTime > markers = baseClip()->snapMarkers(); + if (!m_clip) return snaps; + QList < GenTime > markers = m_clip->snapMarkers(); GenTime pos; for (int i = 0; i < markers.size(); i++) { @@ -1076,7 +1085,8 @@ QList ClipItem::snapMarkers() const QList ClipItem::commentedSnapMarkers() const { QList < CommentedTime > snaps; - QList < CommentedTime > markers = baseClip()->commentedSnapMarkers(); + if (!m_clip) return snaps; + QList < CommentedTime > markers = m_clip->commentedSnapMarkers(); GenTime pos; for (int i = 0; i < markers.size(); i++) { @@ -1301,7 +1311,9 @@ QVariant ClipItem::itemChange(GraphicsItemChange change, const QVariant &value) int xpos = projectScene()->getSnapPointForPos((int) newPos.x(), KdenliveSettings::snaptopoints()); xpos = qMax(xpos, 0); newPos.setX(xpos); - int newTrack = newPos.y() / KdenliveSettings::trackheight(); + // Warning: newPos gives a position relative to the click event, so hack to get absolute pos + int yOffset = property("y_absolute").toInt() + newPos.y(); + int newTrack = yOffset / KdenliveSettings::trackheight(); newTrack = qMin(newTrack, projectScene()->tracksCount() - 1); newTrack = qMax(newTrack, 0); newPos.setY((int)(newTrack * KdenliveSettings::trackheight() + 1)); @@ -1650,8 +1662,8 @@ void ClipItem::setSpeed(const double speed, const int strobe) if (m_speed <= 0 && m_speed > -1) m_speed = -1.0; m_strobe = strobe; - if (m_speed == 1.0) m_clipName = baseClip()->name(); - else m_clipName = baseClip()->name() + " - " + QString::number(speed * 100, 'f', 0) + '%'; + if (m_speed == 1.0) m_clipName = m_clip->name(); + else m_clipName = m_clip->name() + " - " + QString::number(speed * 100, 'f', 0) + '%'; m_info.cropStart = GenTime((int)(m_speedIndependantInfo.cropStart.frames(m_fps) / qAbs(m_speed) + 0.5), m_fps); m_info.cropDuration = GenTime((int)(m_speedIndependantInfo.cropDuration.frames(m_fps) / qAbs(m_speed) + 0.5), m_fps); //update(); @@ -1875,7 +1887,7 @@ Mlt::Producer *ClipItem::getProducer(int track, bool trackSpecific) if (isAudioOnly()) return m_clip->audioProducer(track); else if (isVideoOnly()) - return m_clip->videoProducer(); + return m_clip->videoProducer(track); else return m_clip->getProducer(trackSpecific ? track : -1); } @@ -2074,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"