beautified
This commit is contained in:
parent
50923fcf8c
commit
e5cb155350
|
@ -349,7 +349,7 @@ void QskAnimator::update()
|
||||||
|
|
||||||
if ( m_autoRepeat )
|
if ( m_autoRepeat )
|
||||||
{
|
{
|
||||||
double progress = std::fmod(( driverTime - m_startTime ), m_duration );
|
double progress = std::fmod( driverTime - m_startTime, m_duration );
|
||||||
progress /= m_duration;
|
progress /= m_duration;
|
||||||
|
|
||||||
advance( m_easingCurve.valueForProgress( progress ) );
|
advance( m_easingCurve.valueForProgress( progress ) );
|
||||||
|
|
|
@ -17,7 +17,7 @@ class QSK_EXPORT QskBoundedControl : public QskControl
|
||||||
Q_PROPERTY( qreal minimum READ minimum WRITE setMinimum NOTIFY minimumChanged )
|
Q_PROPERTY( qreal minimum READ minimum WRITE setMinimum NOTIFY minimumChanged )
|
||||||
Q_PROPERTY( qreal maximum READ maximum WRITE setMaximum NOTIFY maximumChanged )
|
Q_PROPERTY( qreal maximum READ maximum WRITE setMaximum NOTIFY maximumChanged )
|
||||||
Q_PROPERTY( QskIntervalF boundaries READ boundaries
|
Q_PROPERTY( QskIntervalF boundaries READ boundaries
|
||||||
WRITE setBoundaries NOTIFY boundariesChanged )
|
WRITE setBoundaries NOTIFY boundariesChanged )
|
||||||
|
|
||||||
using Inherited = QskControl;
|
using Inherited = QskControl;
|
||||||
|
|
||||||
|
|
|
@ -93,7 +93,7 @@ QskProgressBar::QskProgressBar( Qt::Orientation orientation,
|
||||||
initSizePolicy( QskSizePolicy::Fixed, QskSizePolicy::MinimumExpanding );
|
initSizePolicy( QskSizePolicy::Fixed, QskSizePolicy::MinimumExpanding );
|
||||||
|
|
||||||
connect( this, &QskBoundedControl::boundariesChanged,
|
connect( this, &QskBoundedControl::boundariesChanged,
|
||||||
this, &QskProgressBar::adjustValue );
|
this, &QskProgressBar::adjustValue );
|
||||||
}
|
}
|
||||||
|
|
||||||
QskProgressBar::QskProgressBar( Qt::Orientation orientation, QQuickItem* parent )
|
QskProgressBar::QskProgressBar( Qt::Orientation orientation, QQuickItem* parent )
|
||||||
|
|
|
@ -15,17 +15,17 @@ class QSK_EXPORT QskProgressBar : public QskBoundedControl
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
||||||
Q_PROPERTY( Qt::Orientation orientation READ orientation
|
Q_PROPERTY( Qt::Orientation orientation READ orientation
|
||||||
WRITE setOrientation NOTIFY orientationChanged )
|
WRITE setOrientation NOTIFY orientationChanged )
|
||||||
|
|
||||||
Q_PROPERTY( bool indeterminate READ isIndeterminate
|
Q_PROPERTY( bool indeterminate READ isIndeterminate
|
||||||
WRITE setIndeterminate NOTIFY indeterminateChanged )
|
WRITE setIndeterminate NOTIFY indeterminateChanged )
|
||||||
|
|
||||||
Q_PROPERTY( qreal origin READ origin
|
Q_PROPERTY( qreal origin READ origin
|
||||||
WRITE setOrigin RESET resetOrigin NOTIFY originChanged )
|
WRITE setOrigin RESET resetOrigin NOTIFY originChanged )
|
||||||
|
|
||||||
Q_PROPERTY( qreal value READ value WRITE setValue NOTIFY valueChanged )
|
Q_PROPERTY( qreal value READ value WRITE setValue NOTIFY valueChanged )
|
||||||
Q_PROPERTY( qreal valueAsRatio READ valueAsRatio
|
Q_PROPERTY( qreal valueAsRatio READ valueAsRatio
|
||||||
WRITE setValueAsRatio NOTIFY valueChanged )
|
WRITE setValueAsRatio NOTIFY valueChanged )
|
||||||
|
|
||||||
using Inherited = QskBoundedControl;
|
using Inherited = QskBoundedControl;
|
||||||
|
|
||||||
|
@ -48,7 +48,7 @@ class QSK_EXPORT QskProgressBar : public QskBoundedControl
|
||||||
|
|
||||||
QskAspect::Placement effectivePlacement() const override;
|
QskAspect::Placement effectivePlacement() const override;
|
||||||
|
|
||||||
void setBarGradient( const QskGradient & );
|
void setBarGradient( const QskGradient& );
|
||||||
void resetBarGradient();
|
void resetBarGradient();
|
||||||
QskGradient barGradient() const;
|
QskGradient barGradient() const;
|
||||||
|
|
||||||
|
|
|
@ -18,7 +18,7 @@ class QSK_EXPORT QskScrollBox : public QskControl
|
||||||
Q_PROPERTY( Qt::Orientations flickableOrientations READ flickableOrientations
|
Q_PROPERTY( Qt::Orientations flickableOrientations READ flickableOrientations
|
||||||
WRITE setFlickableOrientations NOTIFY flickableOrientationsChanged FINAL )
|
WRITE setFlickableOrientations NOTIFY flickableOrientationsChanged FINAL )
|
||||||
|
|
||||||
Q_PROPERTY( bool autoScrollFocusedItem READ autoScrollFocusItem
|
Q_PROPERTY( bool autoScrollFocusedItem READ autoScrollFocusItem
|
||||||
WRITE setAutoScrollFocusedItem NOTIFY autoScrollFocusedItemChanged FINAL )
|
WRITE setAutoScrollFocusedItem NOTIFY autoScrollFocusedItemChanged FINAL )
|
||||||
|
|
||||||
using Inherited = QskControl;
|
using Inherited = QskControl;
|
||||||
|
|
|
@ -73,15 +73,15 @@ class QSK_EXPORT QskShortcutMap
|
||||||
|
|
||||||
template< typename T >
|
template< typename T >
|
||||||
static int addFunctionT(
|
static int addFunctionT(
|
||||||
QQuickItem* item, const QKeySequence&, bool autoRepeat,
|
QQuickItem*, const QKeySequence&, bool autoRepeat,
|
||||||
const QObject* receiver, T );
|
const QObject* receiver, T );
|
||||||
|
|
||||||
static int addFunction(
|
static int addFunction(
|
||||||
QQuickItem* item, const QKeySequence&, bool autoRepeat,
|
QQuickItem*, const QKeySequence&, bool autoRepeat,
|
||||||
const QObject* receiver, const QskMetaFunction& );
|
const QObject* receiver, const QskMetaFunction& );
|
||||||
|
|
||||||
static int addMethod(
|
static int addMethod(
|
||||||
QQuickItem* item, const QKeySequence&, bool autoRepeat,
|
QQuickItem*, const QKeySequence&, bool autoRepeat,
|
||||||
const QObject* receiver, const char* );
|
const QObject* receiver, const char* );
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -714,7 +714,7 @@ static inline QMarginsF qskEffectivePadding( const QskSkinnable* skinnable,
|
||||||
qMax( padding.top(), paddingHint.top() ),
|
qMax( padding.top(), paddingHint.top() ),
|
||||||
qMax( padding.right(), paddingHint.right() ),
|
qMax( padding.right(), paddingHint.right() ),
|
||||||
qMax( padding.bottom(), paddingHint.bottom() )
|
qMax( padding.bottom(), paddingHint.bottom() )
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
QMarginsF QskSkinnable::innerPadding(
|
QMarginsF QskSkinnable::innerPadding(
|
||||||
|
|
|
@ -95,7 +95,7 @@ class QSK_EXPORT QskSkinnable
|
||||||
void setBoxBorderColorsHint( QskAspect::Aspect, const QskBoxBorderColors& );
|
void setBoxBorderColorsHint( QskAspect::Aspect, const QskBoxBorderColors& );
|
||||||
QskBoxBorderColors boxBorderColorsHint( QskAspect::Aspect, QskSkinHintStatus* = nullptr ) const;
|
QskBoxBorderColors boxBorderColorsHint( QskAspect::Aspect, QskSkinHintStatus* = nullptr ) const;
|
||||||
|
|
||||||
void setIntervalHint( QskAspect::Aspect, const QskIntervalF & );
|
void setIntervalHint( QskAspect::Aspect, const QskIntervalF& );
|
||||||
QskIntervalF intervalHint( QskAspect::Aspect, QskSkinHintStatus* = nullptr ) const;
|
QskIntervalF intervalHint( QskAspect::Aspect, QskSkinHintStatus* = nullptr ) const;
|
||||||
|
|
||||||
void setFlagHint( QskAspect::Aspect, int flag );
|
void setFlagHint( QskAspect::Aspect, int flag );
|
||||||
|
|
|
@ -76,7 +76,7 @@ namespace
|
||||||
setFocusPolicy( Qt::NoFocus );
|
setFocusPolicy( Qt::NoFocus );
|
||||||
|
|
||||||
connect( this, &ScrollBox::scrollPosChanged,
|
connect( this, &ScrollBox::scrollPosChanged,
|
||||||
this, &QskControl::focusIndicatorRectChanged );
|
this, &QskControl::focusIndicatorRectChanged );
|
||||||
}
|
}
|
||||||
|
|
||||||
QRectF focusIndicatorClipRect() const override
|
QRectF focusIndicatorClipRect() const override
|
||||||
|
|
|
@ -358,7 +358,7 @@ bool QskWindow::event( QEvent* event )
|
||||||
{
|
{
|
||||||
const int updateTimerId = qskUpdateTimerId( this );
|
const int updateTimerId = qskUpdateTimerId( this );
|
||||||
|
|
||||||
if ( static_cast<QTimerEvent *>( event )->timerId() == updateTimerId )
|
if ( static_cast< QTimerEvent* >( event )->timerId() == updateTimerId )
|
||||||
{
|
{
|
||||||
if ( !d->renderInterval.isValid() )
|
if ( !d->renderInterval.isValid() )
|
||||||
d->renderInterval.start();
|
d->renderInterval.start();
|
||||||
|
|
Loading…
Reference in New Issue