From ef39151b53422b8072575b96498c15d5c7d87a3a Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Tue, 24 Sep 2019 14:45:42 +1000 Subject: [PATCH] fixed splitting bug --- app/node/block/clip/clip.cpp | 9 +++------ app/node/block/gap/gap.cpp | 7 ++++++- app/widget/timelineview/timelineviewblockitem.cpp | 6 +++++- app/widget/timelineview/undo/undo.cpp | 2 ++ 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/app/node/block/clip/clip.cpp b/app/node/block/clip/clip.cpp index 083ea7989..136336f5d 100644 --- a/app/node/block/clip/clip.cpp +++ b/app/node/block/clip/clip.cpp @@ -33,13 +33,10 @@ Block *ClipBlock::copy() { ClipBlock* c = new ClipBlock(); - // Duplicate connection - // FIXME: This behavior should probably be configurable - if (texture_input()->IsConnected()) { - NodeParam::ConnectEdge(texture_input()->edges().first()->output(), c->texture_input()); - } + c->set_block_name(block_name()); + c->set_length(length()); - return new ClipBlock(); + return c; } Block::Type ClipBlock::type() diff --git a/app/node/block/gap/gap.cpp b/app/node/block/gap/gap.cpp index 671bba1fc..af7a2161e 100644 --- a/app/node/block/gap/gap.cpp +++ b/app/node/block/gap/gap.cpp @@ -26,7 +26,12 @@ GapBlock::GapBlock() Block *GapBlock::copy() { - return new GapBlock(); + GapBlock* c = new GapBlock(); + + c->set_block_name(block_name()); + c->set_length(length()); + + return c; } Block::Type GapBlock::type() diff --git a/app/widget/timelineview/timelineviewblockitem.cpp b/app/widget/timelineview/timelineviewblockitem.cpp index bf27ea1bd..71ff17ed1 100644 --- a/app/widget/timelineview/timelineviewblockitem.cpp +++ b/app/widget/timelineview/timelineviewblockitem.cpp @@ -59,7 +59,11 @@ void TimelineViewBlockItem::UpdateRect() setRect(0, y_, item_width - 1, height_ - 1); setPos(item_left, 0.0); - update(); + // FIXME: Untranslated + setToolTip(QString("%1\n\nIn: %2\nOut: %3\nMedia In: %4").arg(block_->Name(), + QString::number(block_->in().toDouble()), + QString::number(block_->out().toDouble()), + QString::number(block_->media_in().toDouble()))); } void TimelineViewBlockItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) diff --git a/app/widget/timelineview/undo/undo.cpp b/app/widget/timelineview/undo/undo.cpp index d327df25b..eb2adbac3 100644 --- a/app/widget/timelineview/undo/undo.cpp +++ b/app/widget/timelineview/undo/undo.cpp @@ -22,12 +22,14 @@ #include "node/graph.h" +#include Block* CreateSplitBlock(Block* block, rational point, QObject* parent = nullptr) { Block* copy = block->copy(); copy->set_length_and_media_in(block->length() - (point - block->in())); copy->setParent(parent); + return copy; }