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

accurate math on timeline, near-accurate on viewer

Browse Source
This commit is contained in:
itsmattkc
2018-12-25 21:12:25 +11:00
parent edf6f00271
commit 5aca8b881d
6 changed files with 38 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
panels/viewer.cpp
+4 -3
View File
@@ -65,7 +65,7 @@ Viewer::Viewer(QWidget *parent) :
connect(&recording_flasher, SIGNAL(timeout()), this, SLOT(recording_flasher_update()));
connect(ui->horizontalScrollBar, SIGNAL(valueChanged(int)), ui->headers, SLOT(set_scroll(int)));
connect(ui->horizontalScrollBar, SIGNAL(valueChanged(int)), viewer_widget, SLOT(set_waveform_scroll(int)));
connect(ui->horizontalScrollBar, SIGNAL(resized_scroll(double)), this, SLOT(resized_scroll_listener(double)));
connect(ui->horizontalScrollBar, SIGNAL(resize_move(double)), this, SLOT(resize_move(double)));
connect(ui->zoomComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(zoom_update(int)));
update_playhead_timecode(0);
@@ -431,7 +431,8 @@ void Viewer::set_zoom_value(double d) {
viewer_widget->update();
}
ui->headers->set_scrollbar_max(ui->horizontalScrollBar, seq->getEndFrame(), ui->headers->width());
center_scroll_to_playhead(ui->horizontalScrollBar, ui->headers->get_zoom(), seq->playhead);
if (!ui->horizontalScrollBar->is_resizing())
center_scroll_to_playhead(ui->horizontalScrollBar, ui->headers->get_zoom(), seq->playhead);
}
void Viewer::set_media(Media* m) {
@@ -573,7 +574,7 @@ void Viewer::zoom_update(int i) {
ui->glViewerPane->adjust();
}
void Viewer::resized_scroll_listener(double d) {
void Viewer::resize_move(double d) {
set_zoom_value(ui->headers->get_zoom()*d);
}