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

addressed #86 and #89

Browse Source
This commit is contained in:
itsmattkc
2018-06-30 03:02:19 +01:00
parent 384bb4eb5d
commit ae86a36902
11 changed files with 148 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files
panels/timeline.cpp
+13 -14
View File
@@ -198,23 +198,21 @@ bool Timeline::focused() {
}
void Timeline::undo() {
qDebug() << "[INFO] Undo/redo was so buggy, it's not been disabled. Sorry for any inconvenience";
// if (sequence != NULL) {
// current_clips.clear();
// panel_effect_controls->set_clip(NULL);
// sequence->undo();
// redraw_all_clips(false);
// }
// qDebug() << "[INFO] Undo/redo was so buggy, it's been disabled. Sorry for any inconvenience";
if (sequence != NULL) {
panel_effect_controls->clear_effects();
sequence->undo();
redraw_all_clips(false);
}
}
void Timeline::redo() {
qDebug() << "[INFO] Undo/redo was so buggy, it's not been disabled. Sorry for any inconvenience";
// if (sequence != NULL) {
// current_clips.clear();
// panel_effect_controls->set_clip(NULL);
// sequence->redo();
// redraw_all_clips(false);
// }
// qDebug() << "[INFO] Undo/redo was so buggy, it's been disabled. Sorry for any inconvenience";
if (sequence != NULL) {
panel_effect_controls->clear_effects();
sequence->redo();
redraw_all_clips(false);
}
}
QString frame_to_timecode(long f) {
@@ -256,6 +254,7 @@ void Timeline::redraw_all_clips(bool changed) {
project_changed = true;
if (!playing) reset_all_audio();
panel_viewer->viewer_widget->update();
sequence->undo_add_current();
}
ui->video_area->redraw_clips();
panels/timeline.h
+1
View File
@@ -121,6 +121,7 @@ public:
// selecting functions
bool selecting;
int selection_offset;
QVector<Selection> selections;
bool is_clip_selected(Clip* clip);
void delete_selection(bool ripple);