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

using positionHint methods

Browse Source
This commit is contained in:
Uwe Rathmann 2021-12-29 17:05:29 +01:00
parent 22bee7e62e
commit f45be55e90
8 changed files with 23 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
examples/mycontrols/MySkin.cpp
View File

@ -151,10 +151,10 @@ class MySkinEditor : public QskSkinHintTableEditor
for( auto state : { A::NoState, Q::Disabled } ) for( auto state : { A::NoState, Q::Disabled } )
{ {
const auto aspect = Q::Cursor | state | A::Position; const auto aspect = Q::Cursor | state;
setMetric( aspect, 0 ); setPosition( aspect, 0 );
setMetric( aspect | Q::Checked, 1 ); setPosition( aspect | Q::Checked, 1 );
} }
setAnimation( Q::Cursor | A::Metric, animator() ); setAnimation( Q::Cursor | A::Metric, animator() );

2
examples/mycontrols/MyToggleButtonSkinlet.cpp
View File

@ -65,7 +65,7 @@ QRectF MyToggleButtonSkinlet::subControlRect( const QskSkinnable* skinnable,
} }
else if( subControl == Q::Cursor ) else if( subControl == Q::Cursor )
{ {
auto position = skinnable->metric( Q::Cursor | QskAspect::Position ); auto position = skinnable->positionHint( Q::Cursor );
if ( button->isInverted() ) if ( button->isInverted() )
position = 1.0 - position; position = 1.0 - position;

6
skins/material/QskMaterialSkin.cpp
View File

@ -552,10 +552,10 @@ void Editor::setupSwitchButton()
for( auto state : { A::NoState, Q::Disabled } ) for( auto state : { A::NoState, Q::Disabled } )
{ {
auto aspect = Q::Handle | state | A::Position; auto aspect = Q::Handle | state;
setMetric( aspect, 0 ); setPosition( aspect, 0 );
setMetric( aspect | Q::Checked, 1 ); setPosition( aspect | Q::Checked, 1 );
} }
setAnimation( Q::Handle | A::Color, qskDuration ); setAnimation( Q::Handle | A::Color, qskDuration );

10
skins/squiek/QskSquiekSkin.cpp
View File

@ -330,8 +330,8 @@ void Editor::setupMenu()
setColor( Q::Text, QColor( 255, 255, 255 ) ); setColor( Q::Text, QColor( 255, 255, 255 ) );
setFontRole( Q::Text, QskSkin::SmallFont ); setFontRole( Q::Text, QskSkin::SmallFont );
setMetric( Q::Panel | A::Position, 0 ); setPosition( Q::Panel, 0 );
setMetric( Q::Panel | A::Position | QskPopup::Closed, 1 ); setPosition( Q::Panel | QskPopup::Closed, 1 );
setAnimation( Q::Panel | A::Metric, 150 ); setAnimation( Q::Panel | A::Metric, 150 );
setAnimation( Q::Cursor | A::Metric, 50, QEasingCurve::OutCubic ); setAnimation( Q::Cursor | A::Metric, 50, QEasingCurve::OutCubic );
@ -924,10 +924,10 @@ void Editor::setupSwitchButton()
for( auto state : { A::NoState, Q::Disabled } ) for( auto state : { A::NoState, Q::Disabled } )
{ {
auto aspect = Q::Handle | state | A::Position; auto aspect = Q::Handle | state;
setMetric( aspect, 0 ); setPosition( aspect, 0 );
setMetric( aspect | Q::Checked, 1 ); setPosition( aspect | Q::Checked, 1 );
} }
setAnimation( Q::Handle | A::Metric, qskDuration ); setAnimation( Q::Handle | A::Metric, qskDuration );

4
src/controls/QskProgressBar.cpp
View File

@ -30,9 +30,7 @@ namespace
void advance( qreal value ) override void advance( qreal value ) override
{ {
const auto aspect = QskProgressBar::Bar | QskAspect::Position; if ( m_progressBar->setPositionHint( QskProgressBar::Bar, value ) )
m_progressBar->setMetric( aspect, value );
m_progressBar->update(); m_progressBar->update();
} }

2
src/controls/QskProgressBarSkinlet.cpp
View File

@ -17,7 +17,7 @@ static inline QskIntervalF qskBarInterval( const QskProgressBar* bar )
if ( bar->isIndeterminate() ) if ( bar->isIndeterminate() )
{ {
const auto pos = bar->metric( QskProgressBar::Bar | QskAspect::Position ); const auto pos = bar->positionHint( QskProgressBar::Bar );
static const QEasingCurve curve( QEasingCurve::InOutCubic ); static const QEasingCurve curve( QEasingCurve::InOutCubic );

15
src/controls/QskSlider.cpp
View File

@ -107,7 +107,7 @@ bool QskSlider::isTracking() const
void QskSlider::aboutToShow() void QskSlider::aboutToShow()
{ {
setMetric( Handle | QskAspect::Position, valueAsRatio() ); setPositionHint( Handle, valueAsRatio() );
Inherited::aboutToShow(); Inherited::aboutToShow();
} }
@ -221,7 +221,7 @@ void QskSlider::mouseReleaseEvent( QMouseEvent* event )
qreal QskSlider::handlePosition() const qreal QskSlider::handlePosition() const
{ {
return metric( Handle | QskAspect::Position ); return positionHint( Handle );
} }
void QskSlider::moveHandle() void QskSlider::moveHandle()
@ -235,20 +235,19 @@ void QskSlider::moveHandleTo( qreal value, const QskAnimationHint& hint )
setSkinStateFlag( QskSlider::Minimum, value <= minimum() ); setSkinStateFlag( QskSlider::Minimum, value <= minimum() );
setSkinStateFlag( QskSlider::Maximum, value >= maximum() ); setSkinStateFlag( QskSlider::Maximum, value >= maximum() );
const auto aspect = Handle | QskAspect::Metric | QskAspect::Position;
const qreal pos = valueAsRatio( value ); const qreal pos = valueAsRatio( value );
if ( hint.duration > 0 ) if ( hint.isValid() )
{ {
const qreal oldPos = metric( aspect ); const qreal oldPos = positionHint( Handle );
setMetric( aspect, pos ); setPositionHint( Handle, pos );
const auto aspect = Handle | QskAspect::Metric | QskAspect::Position;
startTransition( aspect, hint, oldPos, pos ); startTransition( aspect, hint, oldPos, pos );
} }
else else
{ {
setMetric( aspect, pos ); setPositionHint( Handle, pos );
} }
update(); update();

2
src/controls/QskSwitchButtonSkinlet.cpp
View File

@ -8,7 +8,7 @@
static inline qreal qskEffectivePosition( const QskSwitchButton* switchButton ) static inline qreal qskEffectivePosition( const QskSwitchButton* switchButton )
{ {
auto pos = switchButton->metric( QskSwitchButton::Handle | QskAspect::Position ); auto pos = switchButton->positionHint( QskSwitchButton::Handle );
pos = qBound( 0.0, pos, 1.0 ); pos = qBound( 0.0, pos, 1.0 );
if( switchButton->isInverted() ) if( switchButton->isInverted() )