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

timeline: cleaned up pointer tool derivatives and fixed bug introduced by earlier behavior improvement

Browse Source
This commit is contained in:
itsmattkc
2020-06-01 17:38:24 +10:00
parent 1fce380cc6
commit 001b7179c5
5 changed files with 56 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/widget/timelinewidget/tool/slide.cpp
+3 -5
View File
@@ -31,6 +31,7 @@ TimelineWidget::SlideTool::SlideTool(TimelineWidget* parent) :
SetTrimmingAllowed(false);
SetTrackMovementAllowed(false);
SetTrimOverwriteAllowed(true);
SetGapTrimmingAllowed(true);
}
struct TrackBlockListPair {
@@ -39,12 +40,9 @@ struct TrackBlockListPair {
};
void TimelineWidget::SlideTool::InitiateDrag(TimelineViewBlockItem *clicked_item,
Timeline::MovementMode trim_mode,
bool allow_gap_trimming)
Timeline::MovementMode trim_mode)
{
Q_UNUSED(allow_gap_trimming)
PointerTool::InitiateDrag(clicked_item, trim_mode, true);
PointerTool::InitiateDrag(clicked_item, trim_mode);
// Sort blocks into tracks
QList<TrackBlockListPair> blocks_per_track;