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

Merge branch 'move-time-to-viewer'

Browse Source
This commit is contained in:
itsmattkc
2022-11-01 18:20:22 -07:00
parent d52d5b13b2 3978a8501a
commit 451de7030b
49 changed files with 297 additions and 414 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/widget/timelinewidget/view/timelineview.cpp
+3 -10
View File
@@ -66,15 +66,8 @@ void TimelineView::mousePressEvent(QMouseEvent *event)
QPointF scene_pos = mapToScene(event->pos());
for (auto it=clip_marker_rects_.cbegin(); it!=clip_marker_rects_.cend(); it++) {
if (it.value().contains(scene_pos)) {
QObject *p = this->parent();
while (p) {
if (TimelineWidget *timeline = dynamic_cast<TimelineWidget *>(p)) {
timeline->SetTime(it.key()->time().in());
break;
}
p = p->parent();
}
GetViewerNode()->SetPlayhead(it.key()->time().in());
break;
}
}
@@ -300,7 +293,7 @@ void TimelineView::drawForeground(QPainter *painter, const QRectF &rect)
int x = TimeToScene(recording_coord_.GetFrame());
painter->drawRect(x, GetTrackY(recording_coord_.GetTrack().index()),
TimeToScene(GetTime()) - x, GetTrackHeight(recording_coord_.GetTrack().index()));
TimeToScene(GetViewerNode()->GetPlayhead()) - x, GetTrackHeight(recording_coord_.GetTrack().index()));
}
// Draw standard TimelineViewBase things (such as playhead)