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

most of the interlacing is done

Browse Source
This commit is contained in:
itsmattkc
2018-10-11 19:59:57 +11:00
parent 55a44685a5
commit 5a082d2a28
8 changed files with 96 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
panels/timeline.cpp
+6 -5
View File
@@ -293,10 +293,12 @@ bool Timeline::focused() {
}
void Timeline::repaint_timeline(bool changed) {
if (playing) {
sequence->playhead = round(playhead_start + ((QDateTime::currentMSecsSinceEpoch()-start_msecs) * 0.001 * sequence->frame_rate));
} else if (changed) {
if (changed) {
reset_all_audio();
update_effect_controls();
if (!playing) panel_viewer->viewer_widget->update();
} else if (playing) {
sequence->playhead = round(playhead_start + ((QDateTime::currentMSecsSinceEpoch()-start_msecs) * 0.001 * sequence->frame_rate));
}
ui->headers->update();
@@ -304,8 +306,6 @@ void Timeline::repaint_timeline(bool changed) {
ui->audio_area->update();
panel_effect_controls->update_keyframes();
update_effect_controls();
if (sequence != NULL) {
panel_timeline->ui->horizontalScrollBar->setMaximum(qMax(0, getScreenPointFromFrame(panel_timeline->zoom, sequence->getEndFrame()) + 100 - ui->editAreas->width()));
@@ -318,6 +318,7 @@ void Timeline::repaint_timeline(bool changed) {
if (zoomChanged) {
zoomChanged = false;
int target_scroll = getScreenPointFromFrame(zoom, sequence->playhead)-(ui->editAreas->width()>>1);
// TODO find a way to gradually move towards target_scroll instead of just setting it?
ui->horizontalScrollBar->setValue(target_scroll);
}