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

moved autoscroll code to TimeBasedWidget rather than TimelineViewBase

Browse Source 
Better place for it. Fixes #1406
This commit is contained in:
itsmattkc
2020-11-25 10:00:57 +11:00
parent bd2b3f7a7c
commit c7f5af9534
7 changed files with 37 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/widget/timebased/timebased.cpp
+29
View File
@@ -23,6 +23,7 @@
#include <QInputDialog>
#include <QUndoCommand>
#include "common/autoscroll.h"
#include "common/timecodefunctions.h"
#include "config/config.h"
#include "core.h"
@@ -155,6 +156,22 @@ void TimeBasedWidget::ScrollBarResized(const double &multiplier)
SetScale(GetScale() * corrected_scale);
}
void TimeBasedWidget::PageScrollToPlayhead()
{
int playhead_pos = qRound(TimeToScene(GetTime()));
int viewport_width = ruler()->width();
int viewport_padding = viewport_width / 16;
if (playhead_pos < scrollbar()->value()) {
// Anchor the playhead to the RIGHT of where we scroll to
scrollbar()->setValue(playhead_pos - viewport_width + viewport_padding);
} else if (playhead_pos > scrollbar()->value() + viewport_width) {
// Anchor the playhead to the LEFT of where we scroll to
scrollbar()->setValue(playhead_pos - viewport_padding);
}
}
TimeRuler *TimeBasedWidget::ruler() const
{
return ruler_;
@@ -224,6 +241,18 @@ void TimeBasedWidget::SetTimestamp(int64_t timestamp)
{
ruler_->SetTime(timestamp);
switch (static_cast<AutoScroll::Method>(Config::Current()["Autoscroll"].toInt())) {
case AutoScroll::kNone:
// Do nothing
break;
case AutoScroll::kPage:
QMetaObject::invokeMethod(this, "PageScrollToPlayhead", Qt::QueuedConnection);
break;
case AutoScroll::kSmooth:
QMetaObject::invokeMethod(this, "CenterScrollOnPlayhead", Qt::QueuedConnection);
break;
}
TimeChangedEvent(timestamp);
}