move SliderPrivate::init() code to constructor
This commit is contained in:
parent
2d2a4bc31f
commit
9d9a91cda6
|
@ -12,7 +12,6 @@ Slider::Slider(QWidget *parent)
|
|||
: QAbstractSlider(parent),
|
||||
d_ptr(new SliderPrivate(this))
|
||||
{
|
||||
d_func()->init();
|
||||
}
|
||||
|
||||
Slider::~Slider()
|
||||
|
|
|
@ -19,8 +19,6 @@ class SliderPrivate
|
|||
public:
|
||||
SliderPrivate(Slider *parent);
|
||||
|
||||
void init();
|
||||
|
||||
QRectF trackGeometry() const;
|
||||
QRectF thumbGeometry() const;
|
||||
|
||||
|
@ -54,14 +52,10 @@ SliderPrivate::SliderPrivate(Slider *parent)
|
|||
stepTo(0),
|
||||
oldValue(parent->value()),
|
||||
trackWidth(2)
|
||||
{
|
||||
parent->setMouseTracking(true);
|
||||
}
|
||||
|
||||
void SliderPrivate::init()
|
||||
{
|
||||
Q_Q(Slider);
|
||||
|
||||
q->setMouseTracking(true);
|
||||
q->setFocusPolicy(Qt::StrongFocus);
|
||||
|
||||
QSizePolicy sp(QSizePolicy::Expanding, QSizePolicy::Fixed);
|
||||
|
@ -70,6 +64,8 @@ void SliderPrivate::init()
|
|||
q->setSizePolicy(sp);
|
||||
q->setAttribute(Qt::WA_WState_OwnSizePolicy, false);
|
||||
|
||||
machine->start();
|
||||
|
||||
QCoreApplication::processEvents();
|
||||
}
|
||||
|
||||
|
|
|
@ -214,8 +214,6 @@ SliderStateMachine::SliderStateMachine(Slider *parent, SliderThumb *thumb)
|
|||
transition->addAnimation(animation);
|
||||
|
||||
normalState->addTransition(transition);
|
||||
|
||||
start();
|
||||
}
|
||||
|
||||
SliderStateMachine::~SliderStateMachine()
|
||||
|
|
|
@ -59,7 +59,8 @@ void SliderThumb::paintEvent(QPaintEvent *event)
|
|||
|
||||
brush.setStyle(Qt::SolidPattern);
|
||||
brush.setColor(slider->value() > slider->minimum()
|
||||
? _fillColor : _minFillColor);
|
||||
? (slider->isEnabled() ? _fillColor : Style::instance().themeColor("disabled"))
|
||||
: _minFillColor);
|
||||
painter.setBrush(brush);
|
||||
|
||||
if (_borderWidth > 0) {
|
||||
|
|
|
@ -178,7 +178,7 @@ SliderExamples::SliderExamples(QWidget *parent)
|
|||
}
|
||||
{
|
||||
Slider *slider = new Slider;
|
||||
//slider->setValue(20);
|
||||
slider->setValue(20);
|
||||
slider->setDisabled(true);
|
||||
slider->setMinimumWidth(250);
|
||||
|
||||
|
|
Loading…
Reference in New Issue