oak-team/oak-editor
3
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

improved appearance of transitions in timeline

Browse Source
This commit is contained in:
itsmattkc
2019-12-14 02:57:31 +11:00
parent bc5e7349ef
commit 764fbb74c1
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/widget/timelinewidget/view/timelineviewblockitem.cpp
+15 -3
View File
@@ -91,7 +91,6 @@ void TimelineViewBlockItem::paint(QPainter *painter, const QStyleOptionGraphicsI
grad.setColorAt(0.0, QColor(160, 160, 240)); grad.setColorAt(0.0, QColor(160, 160, 240));
grad.setColorAt(1.0, QColor(128, 128, 192)); grad.setColorAt(1.0, QColor(128, 128, 192));
painter->fillRect(rect(), grad); painter->fillRect(rect(), grad);
//painter->fillRect(rect(), QColor(128, 128, 192));
if (option->state & QStyle::State_Selected) { if (option->state & QStyle::State_Selected) {
painter->fillRect(rect(), QColor(0, 0, 0, 64)); painter->fillRect(rect(), QColor(0, 0, 0, 64));
@@ -101,6 +100,7 @@ void TimelineViewBlockItem::paint(QPainter *painter, const QStyleOptionGraphicsI
painter->drawLine(rect().topLeft(), QPointF(rect().right(), rect().top())); painter->drawLine(rect().topLeft(), QPointF(rect().right(), rect().top()));
painter->drawLine(rect().topLeft(), QPointF(rect().left(), rect().bottom() - 1)); painter->drawLine(rect().topLeft(), QPointF(rect().left(), rect().bottom() - 1));
painter->setPen(Qt::white);
painter->drawText(rect(), static_cast<int>(Qt::AlignLeft | Qt::AlignTop), block_->block_name()); painter->drawText(rect(), static_cast<int>(Qt::AlignLeft | Qt::AlignTop), block_->block_name());
// Linked clips are underlined // Linked clips are underlined
@@ -127,10 +127,22 @@ void TimelineViewBlockItem::paint(QPainter *painter, const QStyleOptionGraphicsI
break; break;
case Block::kTransition: case Block::kTransition:
{ {
painter->setBrush(QColor(128, 96, 192)); QLinearGradient grad;
painter->setPen(QColor(48, 32, 64)); grad.setStart(0, rect().top());
grad.setFinalStop(0, rect().bottom());
grad.setColorAt(0.0, QColor(192, 160, 224));
grad.setColorAt(1.0, QColor(160, 128, 192));
painter->setBrush(grad);
painter->setPen(QPen(QColor(96, 80, 112), 1));
painter->drawRect(rect()); painter->drawRect(rect());
if (option->state & QStyle::State_Selected) {
painter->fillRect(rect(), QColor(0, 0, 0, 64));
}
// Draw lines antialiased
painter->setRenderHint(QPainter::Antialiasing);
TransitionBlock* t = static_cast<TransitionBlock*>(block_); TransitionBlock* t = static_cast<TransitionBlock*>(block_);
if (t->out_block_input()->IsConnected()) { if (t->out_block_input()->IsConnected()) {
// Transition fades something out, we'll draw a line // Transition fades something out, we'll draw a line