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

further improvements

Browse Source
This commit is contained in:
itsmattkc
2019-02-14 12:37:30 -08:00
parent e9fe837236
commit abe76c7941
35 changed files with 737 additions and 878 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ui/timelineheader.cpp
+6 -6
View File
@@ -95,7 +95,7 @@ void TimelineHeader::set_in_point(long new_in) {
new_out = viewer->seq->getEndFrame();
}
undo_stack.push(new SetTimelineInOutCommand(viewer->seq, true, new_in, new_out));
Olive::UndoStack.push(new SetTimelineInOutCommand(viewer->seq, true, new_in, new_out));
update_parents();
}
@@ -107,7 +107,7 @@ void TimelineHeader::set_out_point(long new_out) {
new_in = 0;
}
undo_stack.push(new SetTimelineInOutCommand(viewer->seq, true, new_in, new_out));
Olive::UndoStack.push(new SetTimelineInOutCommand(viewer->seq, true, new_in, new_out));
update_parents();
}
@@ -260,7 +260,7 @@ void TimelineHeader::mouseReleaseEvent(QMouseEvent*) {
if (viewer->seq != nullptr) {
dragging = false;
if (resizing_workarea) {
undo_stack.push(new SetTimelineInOutCommand(viewer->seq, true, temp_workarea_in, temp_workarea_out));
Olive::UndoStack.push(new SetTimelineInOutCommand(viewer->seq, true, temp_workarea_in, temp_workarea_out));
} else if (dragging_markers && selected_markers.size() > 0) {
bool moved = false;
ComboAction* ca = new ComboAction();
@@ -272,7 +272,7 @@ void TimelineHeader::mouseReleaseEvent(QMouseEvent*) {
}
}
if (moved) {
undo_stack.push(ca);
Olive::UndoStack.push(ca);
} else {
delete ca;
}
@@ -310,7 +310,7 @@ void TimelineHeader::delete_markers() {
for (int i=0;i<selected_markers.size();i++) {
dma->markers.append(selected_markers.at(i));
}
undo_stack.push(dma);
Olive::UndoStack.push(dma);
update_parents();
}
}
@@ -418,7 +418,7 @@ void TimelineHeader::paintEvent(QPaintEvent*) {
}
}
draw_marker(p, marker_x, yoff, height()-1, selected, false);
draw_marker(p, marker_x, yoff, height()-1, selected);
}
// draw playhead triangle