This commit is contained in:
itsmattkc
2018-08-24 13:59:13 +10:00
parent 48867ba239
commit e2ba84976d
2 changed files with 14 additions and 3 deletions
+11 -3
View File
@@ -55,7 +55,8 @@ Timeline::Timeline(QWidget *parent) :
splitting(false),
importing(false),
ui(new Ui::Timeline),
last_frame(0)
last_frame(0),
zoomChanged(false)
{
default_track_height = (QGuiApplication::primaryScreen()->logicalDotsPerInch() / 96) * TRACK_DEFAULT_HEIGHT;
@@ -298,7 +299,13 @@ void Timeline::redraw_all_clips(bool changed) {
ui->headers->update_header(zoom);
ui->video_area->redraw_clips();
ui->audio_area->redraw_clips();
panel_effect_controls->update_keyframes();
panel_effect_controls->update_keyframes();
if (zoomChanged) {
ui->audioScrollArea->update();
ui->audioScrollArea->horizontalScrollBar()->setValue(getTimelineScreenPointFromFrame(playhead)-(ui->audioScrollArea->width()/2));
zoomChanged = false;
}
panel_viewer->update_end_timecode();
}
@@ -408,7 +415,8 @@ void Timeline::set_zoom(bool in) {
zoom *= 2;
} else {
zoom /= 2;
}
}
zoomChanged = true;
redraw_all_clips(false);
}
+3
View File
@@ -180,6 +180,9 @@ public:
// importing
bool importing;
// zoom variables
bool zoomChanged;
Ui::Timeline *ui;
public slots:
void repaint_timeline();