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

reworked timeline elements

Browse Source
This commit is contained in:
itsmattkc
2021-08-01 11:05:18 -07:00
parent 8054124924
commit 6995ffe015
18 changed files with 314 additions and 271 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/widget/timelinewidget/tool/pointer.cpp
+11 -13
View File
@@ -54,6 +54,7 @@ void PointerTool::MousePress(TimelineViewMouseEvent *event)
// Determine if item clicked on is selectable
clicked_item_ = parent()->GetItemAtScenePos(event->GetCoordinates());
ClipBlock *clip_clicked_item = dynamic_cast<ClipBlock*>(clicked_item_);
can_rubberband_select_ = false;
@@ -92,9 +93,9 @@ void PointerTool::MousePress(TimelineViewMouseEvent *event)
deselected_blocks.append(clicked_item_);
// If not holding alt, deselect all links as well
if (!(event->GetModifiers() & Qt::AltModifier)) {
parent()->SetBlockLinksSelected(clicked_item_, false);
deselected_blocks.append(clicked_item_->block_links());
if (clip_clicked_item && !(event->GetModifiers() & Qt::AltModifier)) {
parent()->SetBlockLinksSelected(clip_clicked_item, false);
deselected_blocks.append(clip_clicked_item->block_links());
}
}
@@ -119,9 +120,9 @@ void PointerTool::MousePress(TimelineViewMouseEvent *event)
selected_blocks.append(clicked_item_);
// If not holding alt, select all links as well
if (!(event->GetModifiers() & Qt::AltModifier)) {
parent()->SetBlockLinksSelected(clicked_item_, true);
selected_blocks.append(clicked_item_->block_links());
if (clip_clicked_item && !(event->GetModifiers() & Qt::AltModifier)) {
parent()->SetBlockLinksSelected(clip_clicked_item, true);
selected_blocks.append(clip_clicked_item->block_links());
}
parent()->SignalSelectedBlocks(selected_blocks);
@@ -329,10 +330,6 @@ void PointerTool::InitiateDragInternal(Block *clicked_item,
// Create ghost for this block
AddGhostFromBlock(block, trim_mode, true);
// Create ghosts for this block's transitions if any
AddGhostFromBlock(block->in_transition(), trim_mode, true);
AddGhostFromBlock(block->out_transition(), trim_mode, true);
}
}
@@ -361,15 +358,16 @@ void PointerTool::InitiateDragInternal(Block *clicked_item,
// transition than a trim/roll
bool treat_trim_as_slide = false;
if (dynamic_cast<ClipBlock*>(block)) {
ClipBlock *cb = dynamic_cast<ClipBlock*>(block);
if (cb) {
// See if this clip has a transition attached, and move it with the trim if so
TransitionBlock* connected_transition;
// Get appropriate transition for the side of the clip
if (trim_mode == Timeline::kTrimIn) {
connected_transition = block->in_transition();
connected_transition = cb->in_transition();
} else {
connected_transition = block->out_transition();
connected_transition = cb->out_transition();
}
if (connected_transition) {