168492376
/
qskinny
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

using effectiveSubcontrol when setting the position of the handle

This commit is contained in:
Uwe Rathmann 2020-09-21 11:31:37 +02:00
parent fef6e1cef1
commit 9d01f938f5
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/controls/QskSlider.cpp
View File

@ -50,8 +50,6 @@ QskSlider::QskSlider( Qt::Orientation orientation, QQuickItem* parent )
else else
initSizePolicy( QskSizePolicy::Fixed, QskSizePolicy::Minimum ); initSizePolicy( QskSizePolicy::Fixed, QskSizePolicy::Minimum );
setMetric( QskSlider::Handle | QskAspect::Position, valueAsRatio() );
connect( this, &QskSlider::boundariesChanged, [ this ]() { updatePosition(); } ); connect( this, &QskSlider::boundariesChanged, [ this ]() { updatePosition(); } );
connect( this, &QskSlider::valueChanged, [ this ]() { updatePosition(); } ); connect( this, &QskSlider::valueChanged, [ this ]() { updatePosition(); } );
} }
@ -105,6 +103,14 @@ bool QskSlider::isTracking() const
return m_data->tracking; return m_data->tracking;
} }
void QskSlider::aboutToShow()
{
const auto subControl = effectiveSubcontrol( QskSlider::Handle );
setMetric( subControl | QskAspect::Position, valueAsRatio() );
Inherited::aboutToShow();
}
QSizeF QskSlider::contentsSizeHint( QSizeF QskSlider::contentsSizeHint(
Qt::SizeHint which, const QSizeF& ) const Qt::SizeHint which, const QSizeF& ) const
{ {
@ -223,7 +229,7 @@ void QskSlider::updatePosition()
setSkinStateFlag( QskSlider::Minimum, value() <= minimum() ); setSkinStateFlag( QskSlider::Minimum, value() <= minimum() );
setSkinStateFlag( QskSlider::Maximum, value() >= maximum() ); setSkinStateFlag( QskSlider::Maximum, value() >= maximum() );
const Aspect aspect = QskSlider::Handle | Position | Metric; const auto aspect = effectiveSubcontrol( QskSlider::Handle ) | Position | Metric;
const auto hint = animation( aspect | skinState() ); const auto hint = animation( aspect | skinState() );
const qreal pos = valueAsRatio(); const qreal pos = valueAsRatio();

2
src/controls/QskSlider.h
View File

@ -58,6 +58,8 @@ class QSK_EXPORT QskSlider : public QskBoundedValueInput
QSizeF handleSize() const; QSizeF handleSize() const;
QRectF handleRect() const; QRectF handleRect() const;
void aboutToShow() override;
private: private:
void updatePosition(); void updatePosition();