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

timeline: made ReplaceBlocksWithGaps more accessible for other parts of the program

Browse Source
This commit is contained in:
itsmattkc
2020-09-28 14:28:56 +10:00
parent a313fb525c
commit dac68cabc2
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/widget/timelinewidget/timelinewidget.cpp
-5
View File
@@ -505,16 +505,11 @@ void TimelineWidget::DeleteSelected(bool ripple)
{ {
QList<TimelineViewBlockItem *> selected_list = GetSelectedBlocks(); QList<TimelineViewBlockItem *> selected_list = GetSelectedBlocks();
QList<Block*> blocks_to_delete; QList<Block*> blocks_to_delete;
QList<TrackReference> tracks_affected;
foreach (TimelineViewBlockItem* item, selected_list) { foreach (TimelineViewBlockItem* item, selected_list) {
Block* b = item->block(); Block* b = item->block();
blocks_to_delete.append(b); blocks_to_delete.append(b);
if (!tracks_affected.contains(item->Track())) {
tracks_affected.append(item->Track());
}
} }
// No-op if nothing is selected // No-op if nothing is selected
app/widget/timelinewidget/timelinewidget.h
+2 -2
View File
@@ -103,6 +103,8 @@ public:
void RestoreSplitterState(const QByteArray& state); void RestoreSplitterState(const QByteArray& state);
static void ReplaceBlocksWithGaps(const QList<Block *>& blocks, bool remove_from_graph, QUndoCommand* command);
signals: signals:
void BlocksSelected(const QList<Block*>& selected_blocks); void BlocksSelected(const QList<Block*>& selected_blocks);
@@ -460,8 +462,6 @@ private:
void InsertGapsAt(const rational& time, const rational& length, QUndoCommand* command); void InsertGapsAt(const rational& time, const rational& length, QUndoCommand* command);
void ReplaceBlocksWithGaps(const QList<Block *>& blocks, bool remove_from_graph, QUndoCommand* command);
void SetBlockLinksSelected(Block *block, bool selected); void SetBlockLinksSelected(Block *block, bool selected);
QVector<Timeline::EditToInfo> GetEditToInfo(const rational &playhead_time, Timeline::MovementMode mode); QVector<Timeline::EditToInfo> GetEditToInfo(const rational &playhead_time, Timeline::MovementMode mode);