Merge branch 'move-time-to-viewer'

This commit is contained in:
itsmattkc
2022-11-01 18:20:22 -07:00
49 changed files with 297 additions and 414 deletions
+3 -5
View File
@@ -151,7 +151,7 @@ bool SeekableWidget::PasteMarkers()
for (auto it=markers.cbegin(); it!=markers.cend(); it++) {
min = std::min(min, (*it)->time().in());
}
min -= GetTime();
min -= GetViewerNode()->GetPlayhead();
for (auto it=markers.cbegin(); it!=markers.cend(); it++) {
TimelineMarker *m = *it;
@@ -391,10 +391,8 @@ void SeekableWidget::SeekToScenePoint(qreal scene)
playhead_time += movement;
}
if (playhead_time != GetTime()) {
SetTime(playhead_time);
emit TimeChanged(playhead_time);
if (playhead_time != GetViewerNode()->GetPlayhead()) {
GetViewerNode()->SetPlayhead(playhead_time);
}
}