change: change code style to Linux style except indent.
This commit is contained in:
@@ -27,123 +27,142 @@
|
||||
|
||||
#include "ui/colorcoding.h"
|
||||
|
||||
namespace olive {
|
||||
namespace olive
|
||||
{
|
||||
|
||||
ResizableTimelineScrollBar::ResizableTimelineScrollBar(QWidget* parent) :
|
||||
ResizableScrollBar(parent),
|
||||
markers_(nullptr),
|
||||
workarea_(nullptr),
|
||||
scale_(1.0)
|
||||
ResizableTimelineScrollBar::ResizableTimelineScrollBar(QWidget *parent)
|
||||
: ResizableScrollBar(parent)
|
||||
, markers_(nullptr)
|
||||
, workarea_(nullptr)
|
||||
, scale_(1.0)
|
||||
{
|
||||
}
|
||||
|
||||
ResizableTimelineScrollBar::ResizableTimelineScrollBar(Qt::Orientation orientation, QWidget* parent) :
|
||||
ResizableScrollBar(orientation, parent),
|
||||
markers_(nullptr),
|
||||
workarea_(nullptr),
|
||||
scale_(1.0)
|
||||
ResizableTimelineScrollBar::ResizableTimelineScrollBar(
|
||||
Qt::Orientation orientation, QWidget *parent)
|
||||
: ResizableScrollBar(orientation, parent)
|
||||
, markers_(nullptr)
|
||||
, workarea_(nullptr)
|
||||
, scale_(1.0)
|
||||
{
|
||||
}
|
||||
|
||||
void ResizableTimelineScrollBar::ConnectMarkers(TimelineMarkerList *markers)
|
||||
{
|
||||
if (markers_) {
|
||||
disconnect(markers_, &TimelineMarkerList::MarkerAdded, this, static_cast<void (ResizableTimelineScrollBar::*)()>(&ResizableTimelineScrollBar::update));
|
||||
disconnect(markers_, &TimelineMarkerList::MarkerRemoved, this, static_cast<void (ResizableTimelineScrollBar::*)()>(&ResizableTimelineScrollBar::update));
|
||||
disconnect(markers_, &TimelineMarkerList::MarkerModified, this, static_cast<void (ResizableTimelineScrollBar::*)()>(&ResizableTimelineScrollBar::update));
|
||||
}
|
||||
if (markers_) {
|
||||
disconnect(markers_, &TimelineMarkerList::MarkerAdded, this,
|
||||
static_cast<void (ResizableTimelineScrollBar::*)()>(
|
||||
&ResizableTimelineScrollBar::update));
|
||||
disconnect(markers_, &TimelineMarkerList::MarkerRemoved, this,
|
||||
static_cast<void (ResizableTimelineScrollBar::*)()>(
|
||||
&ResizableTimelineScrollBar::update));
|
||||
disconnect(markers_, &TimelineMarkerList::MarkerModified, this,
|
||||
static_cast<void (ResizableTimelineScrollBar::*)()>(
|
||||
&ResizableTimelineScrollBar::update));
|
||||
}
|
||||
|
||||
markers_ = markers;
|
||||
markers_ = markers;
|
||||
|
||||
if (markers_) {
|
||||
connect(markers_, &TimelineMarkerList::MarkerAdded, this, static_cast<void (ResizableTimelineScrollBar::*)()>(&ResizableTimelineScrollBar::update));
|
||||
connect(markers_, &TimelineMarkerList::MarkerRemoved, this, static_cast<void (ResizableTimelineScrollBar::*)()>(&ResizableTimelineScrollBar::update));
|
||||
connect(markers_, &TimelineMarkerList::MarkerModified, this, static_cast<void (ResizableTimelineScrollBar::*)()>(&ResizableTimelineScrollBar::update));
|
||||
}
|
||||
if (markers_) {
|
||||
connect(markers_, &TimelineMarkerList::MarkerAdded, this,
|
||||
static_cast<void (ResizableTimelineScrollBar::*)()>(
|
||||
&ResizableTimelineScrollBar::update));
|
||||
connect(markers_, &TimelineMarkerList::MarkerRemoved, this,
|
||||
static_cast<void (ResizableTimelineScrollBar::*)()>(
|
||||
&ResizableTimelineScrollBar::update));
|
||||
connect(markers_, &TimelineMarkerList::MarkerModified, this,
|
||||
static_cast<void (ResizableTimelineScrollBar::*)()>(
|
||||
&ResizableTimelineScrollBar::update));
|
||||
}
|
||||
|
||||
update();
|
||||
update();
|
||||
}
|
||||
|
||||
void ResizableTimelineScrollBar::ConnectWorkArea(TimelineWorkArea *workarea)
|
||||
{
|
||||
if (workarea_) {
|
||||
disconnect(workarea_, &TimelineWorkArea::RangeChanged, this, static_cast<void (ResizableTimelineScrollBar::*)()>(&ResizableTimelineScrollBar::update));
|
||||
disconnect(workarea_, &TimelineWorkArea::EnabledChanged, this, static_cast<void (ResizableTimelineScrollBar::*)()>(&ResizableTimelineScrollBar::update));
|
||||
}
|
||||
if (workarea_) {
|
||||
disconnect(workarea_, &TimelineWorkArea::RangeChanged, this,
|
||||
static_cast<void (ResizableTimelineScrollBar::*)()>(
|
||||
&ResizableTimelineScrollBar::update));
|
||||
disconnect(workarea_, &TimelineWorkArea::EnabledChanged, this,
|
||||
static_cast<void (ResizableTimelineScrollBar::*)()>(
|
||||
&ResizableTimelineScrollBar::update));
|
||||
}
|
||||
|
||||
workarea_ = workarea;
|
||||
workarea_ = workarea;
|
||||
|
||||
if (workarea_) {
|
||||
connect(workarea_, &TimelineWorkArea::RangeChanged, this, static_cast<void (ResizableTimelineScrollBar::*)()>(&ResizableTimelineScrollBar::update));
|
||||
connect(workarea_, &TimelineWorkArea::EnabledChanged, this, static_cast<void (ResizableTimelineScrollBar::*)()>(&ResizableTimelineScrollBar::update));
|
||||
}
|
||||
if (workarea_) {
|
||||
connect(workarea_, &TimelineWorkArea::RangeChanged, this,
|
||||
static_cast<void (ResizableTimelineScrollBar::*)()>(
|
||||
&ResizableTimelineScrollBar::update));
|
||||
connect(workarea_, &TimelineWorkArea::EnabledChanged, this,
|
||||
static_cast<void (ResizableTimelineScrollBar::*)()>(
|
||||
&ResizableTimelineScrollBar::update));
|
||||
}
|
||||
|
||||
update();
|
||||
update();
|
||||
}
|
||||
|
||||
void ResizableTimelineScrollBar::SetScale(double d)
|
||||
{
|
||||
scale_ = d;
|
||||
scale_ = d;
|
||||
|
||||
update();
|
||||
update();
|
||||
}
|
||||
|
||||
void ResizableTimelineScrollBar::paintEvent(QPaintEvent *event)
|
||||
{
|
||||
ResizableScrollBar::paintEvent(event);
|
||||
ResizableScrollBar::paintEvent(event);
|
||||
|
||||
if (!timebase().isNull() && ((workarea_ && workarea_->enabled()) || (markers_ && !markers_->empty()))) {
|
||||
// Draw workarea
|
||||
QStyleOptionSlider opt;
|
||||
initStyleOption(&opt);
|
||||
if (!timebase().isNull() && ((workarea_ && workarea_->enabled()) ||
|
||||
(markers_ && !markers_->empty()))) {
|
||||
// Draw workarea
|
||||
QStyleOptionSlider opt;
|
||||
initStyleOption(&opt);
|
||||
|
||||
QRect gr = style()->subControlRect(QStyle::CC_ScrollBar, &opt,
|
||||
QStyle::SC_ScrollBarGroove, this);
|
||||
QRect gr = style()->subControlRect(QStyle::CC_ScrollBar, &opt,
|
||||
QStyle::SC_ScrollBarGroove, this);
|
||||
|
||||
double ratio = scale_ * double(gr.width()) / double(this->maximum() + gr.width());
|
||||
QPainter p(this);
|
||||
double ratio =
|
||||
scale_ * double(gr.width()) / double(this->maximum() + gr.width());
|
||||
QPainter p(this);
|
||||
|
||||
if (workarea_ && workarea_->enabled()) {
|
||||
if (workarea_ && workarea_->enabled()) {
|
||||
QColor workarea_color(this->palette().highlight().color());
|
||||
workarea_color.setAlpha(128);
|
||||
|
||||
QColor workarea_color(this->palette().highlight().color());
|
||||
workarea_color.setAlpha(128);
|
||||
qint64 in =
|
||||
qMax(qint64(0), qRound64(ratio * TimeToScene(workarea_->in())));
|
||||
|
||||
qint64 in = qMax(qint64(0), qRound64(ratio * TimeToScene(workarea_->in())));
|
||||
qint64 out;
|
||||
if (workarea_->out() == RATIONAL_MAX) {
|
||||
out = gr.width();
|
||||
} else {
|
||||
out = qMin(qint64(gr.width()),
|
||||
qRound64(ratio * TimeToScene(workarea_->out())));
|
||||
}
|
||||
|
||||
qint64 out;
|
||||
if (workarea_->out() == RATIONAL_MAX) {
|
||||
out = gr.width();
|
||||
} else {
|
||||
out = qMin(qint64(gr.width()), qRound64(ratio * TimeToScene(workarea_->out())));
|
||||
}
|
||||
qint64 length = qMax(qint64(1), out - in);
|
||||
|
||||
qint64 length = qMax(qint64(1), out-in);
|
||||
p.fillRect(gr.x() + in, 0, length, height(), workarea_color);
|
||||
}
|
||||
|
||||
p.fillRect(gr.x() + in,
|
||||
0,
|
||||
length,
|
||||
height(),
|
||||
workarea_color);
|
||||
}
|
||||
// Draw markers
|
||||
if (markers_ && !markers_->empty()) {
|
||||
for (auto it = markers_->cbegin(); it != markers_->cend(); it++) {
|
||||
TimelineMarker *marker = *it;
|
||||
|
||||
// Draw markers
|
||||
if (markers_ && !markers_->empty()) {
|
||||
for (auto it=markers_->cbegin(); it!=markers_->cend(); it++) {
|
||||
TimelineMarker* marker = *it;
|
||||
QColor marker_color =
|
||||
QtUtils::toQColor(ColorCoding::GetColor(marker->color()));
|
||||
int64_t in = qRound64(ratio * TimeToScene(marker->time().in()));
|
||||
int64_t out =
|
||||
qRound64(ratio * TimeToScene(marker->time().out()));
|
||||
int64_t length = qMax(int64_t(1), out - in);
|
||||
|
||||
QColor marker_color = QtUtils::toQColor(ColorCoding::GetColor(marker->color()));
|
||||
int64_t in = qRound64(ratio * TimeToScene(marker->time().in()));
|
||||
int64_t out = qRound64(ratio * TimeToScene(marker->time().out()));
|
||||
int64_t length = qMax(int64_t(1), out-in);
|
||||
|
||||
p.fillRect(gr.x() + in,
|
||||
0,
|
||||
length,
|
||||
height(),
|
||||
marker_color);
|
||||
}
|
||||
}
|
||||
}
|
||||
p.fillRect(gr.x() + in, 0, length, height(), marker_color);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user