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

transitiontool: updated

Browse Source
This commit is contained in:
itsmattkc
2021-08-16 21:28:13 -07:00
parent cc4ead6935
commit 9dad2ef104
5 changed files with 68 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/widget/timelinewidget/tool/transition.cpp
+11 -6
View File
@@ -103,22 +103,24 @@ void TransitionTool::MouseRelease(TimelineViewMouseEvent *event)
transition = static_cast<TransitionBlock*>(NodeFactory::CreateFromID(Core::instance()->GetSelectedTransition()));
}
// Set transition length
rational len = ghost_->GetAdjustedLength();
transition->set_length_and_media_out(len);
MultiUndoCommand* command = new MultiUndoCommand();
// Place transition in place
command->add_child(new NodeAddCommand(static_cast<NodeGraph*>(parent()->GetConnectedNode()->parent()),
transition));
command->add_child(new NodeSetPositionCommand(transition, transition, QPointF(0, 0), false));
command->add_child(new TrackPlaceBlockCommand(sequence()->track_list(track.type()),
track.index(),
transition,
ghost_->GetAdjustedIn()));
if (dual_transition_) {
rational half_len = ghost_->GetAdjustedLength()/2;
transition->set_in_offset(half_len);
transition->set_out_offset(half_len);
// Block mouse is hovering over
Block* active_block = Node::ValueToPtr<Block>(ghost_->GetData(TimelineViewGhostItem::kAttachedBlock));
@@ -135,21 +137,24 @@ void TransitionTool::MouseRelease(TimelineViewMouseEvent *event)
command->add_child(new NodeEdgeAddCommand(in_block,
NodeInput(transition, TransitionBlock::kInBlockInput)));
command->add_child(new NodeSetPositionCommand(out_block, transition, QPointF(-1, -0.5), false));
command->add_child(new NodeSetPositionCommand(in_block, transition, QPointF(-1, 0.5), false));
} else {
Block* block_to_transition = Node::ValueToPtr<Block>(ghost_->GetData(TimelineViewGhostItem::kAttachedBlock));
QString transition_input_to_connect;
if (ghost_->GetMode() == Timeline::kTrimIn) {
transition->set_length_and_media_out(ghost_->GetAdjustedLength());
transition_input_to_connect = TransitionBlock::kInBlockInput;
} else {
transition->set_length_and_media_out(ghost_->GetAdjustedLength());
transition_input_to_connect = TransitionBlock::kOutBlockInput;
}
// Connect block to transition
command->add_child(new NodeEdgeAddCommand(block_to_transition,
NodeInput(transition, transition_input_to_connect)));
command->add_child(new NodeSetPositionCommand(block_to_transition, transition, QPointF(-1, 0), false));
}
Core::instance()->undo_stack()->push(command);