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

QskBoundedValueControl -> QskBoundedValueInput

Browse Source
This commit is contained in:
Uwe Rathmann 2020-07-25 13:05:19 +02:00
parent 2aadafc34c
commit bf4d401fd2
6 changed files with 48 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/automotive/Speedometer.cpp
View File

@ -14,7 +14,7 @@ QSK_SUBCONTROL( Speedometer, NeedleHead )
QSK_SUBCONTROL( Speedometer, Needle ) QSK_SUBCONTROL( Speedometer, Needle )
Speedometer::Speedometer( QQuickItem* parent ) Speedometer::Speedometer( QQuickItem* parent )
: QskBoundedValueControl( parent ) : QskBoundedValueInput( parent )
{ {
} }

4
examples/automotive/Speedometer.h
View File

@ -6,9 +6,9 @@
#ifndef SPEEDOMETER_H #ifndef SPEEDOMETER_H
#define SPEEDOMETER_H #define SPEEDOMETER_H
#include <QskBoundedValueControl.h> #include <QskBoundedValueInput.h>
class Speedometer : public QskBoundedValueControl class Speedometer : public QskBoundedValueInput
{ {
Q_OBJECT Q_OBJECT

70
src/controls/QskBoundedValueControl.cpp → src/controls/QskBoundedValueInput.cpp
View File

@ -3,13 +3,13 @@
* This file may be used under the terms of the QSkinny License, Version 1.0 * This file may be used under the terms of the QSkinny License, Version 1.0
*****************************************************************************/ *****************************************************************************/
#include "QskBoundedValueControl.h" #include "QskBoundedValueInput.h"
#include "QskFunctions.h" #include "QskFunctions.h"
#include "QskIntervalF.h" #include "QskIntervalF.h"
QSK_SYSTEM_STATE( QskBoundedValueControl, ReadOnly, ( QskAspect::FirstSystemState << 1 ) ) QSK_SYSTEM_STATE( QskBoundedValueInput, ReadOnly, ( QskAspect::FirstSystemState << 1 ) )
class QskBoundedValueControl::PrivateData class QskBoundedValueInput::PrivateData
{ {
public: public:
PrivateData() PrivateData()
@ -30,7 +30,7 @@ class QskBoundedValueControl::PrivateData
bool snap : 1; bool snap : 1;
}; };
QskBoundedValueControl::QskBoundedValueControl( QQuickItem* parent ) QskBoundedValueInput::QskBoundedValueInput( QQuickItem* parent )
: QskControl( parent ) : QskControl( parent )
, m_data( new PrivateData() ) , m_data( new PrivateData() )
{ {
@ -39,11 +39,11 @@ QskBoundedValueControl::QskBoundedValueControl( QQuickItem* parent )
setWheelEnabled( true ); setWheelEnabled( true );
} }
QskBoundedValueControl::~QskBoundedValueControl() QskBoundedValueInput::~QskBoundedValueInput()
{ {
} }
void QskBoundedValueControl::setMinimum( qreal minimum ) void QskBoundedValueInput::setMinimum( qreal minimum )
{ {
if ( m_data->minimum == minimum ) if ( m_data->minimum == minimum )
return; return;
@ -58,12 +58,12 @@ void QskBoundedValueControl::setMinimum( qreal minimum )
update(); update();
} }
qreal QskBoundedValueControl::minimum() const qreal QskBoundedValueInput::minimum() const
{ {
return m_data->minimum; return m_data->minimum;
} }
void QskBoundedValueControl::setMaximum( qreal maximum ) void QskBoundedValueInput::setMaximum( qreal maximum )
{ {
if ( m_data->maximum == maximum ) if ( m_data->maximum == maximum )
return; return;
@ -78,12 +78,12 @@ void QskBoundedValueControl::setMaximum( qreal maximum )
update(); update();
} }
qreal QskBoundedValueControl::maximum() const qreal QskBoundedValueInput::maximum() const
{ {
return m_data->maximum; return m_data->maximum;
} }
void QskBoundedValueControl::setBoundaries( qreal min, qreal max ) void QskBoundedValueInput::setBoundaries( qreal min, qreal max )
{ {
if ( max < min ) if ( max < min )
max = min; max = min;
@ -110,17 +110,17 @@ void QskBoundedValueControl::setBoundaries( qreal min, qreal max )
update(); update();
} }
void QskBoundedValueControl::setBoundaries( const QskIntervalF& boundaries ) void QskBoundedValueInput::setBoundaries( const QskIntervalF& boundaries )
{ {
setBoundaries( boundaries.lowerBound(), boundaries.upperBound() ); setBoundaries( boundaries.lowerBound(), boundaries.upperBound() );
} }
QskIntervalF QskBoundedValueControl::boundaries() const QskIntervalF QskBoundedValueInput::boundaries() const
{ {
return QskIntervalF( m_data->minimum, m_data->maximum ); return QskIntervalF( m_data->minimum, m_data->maximum );
} }
void QskBoundedValueControl::adjustBoundariesAndValue( bool increasing ) void QskBoundedValueInput::adjustBoundariesAndValue( bool increasing )
{ {
if ( m_data->maximum < m_data->minimum ) if ( m_data->maximum < m_data->minimum )
{ {
@ -150,28 +150,28 @@ void QskBoundedValueControl::adjustBoundariesAndValue( bool increasing )
} }
} }
qreal QskBoundedValueControl::boundaryLength() const qreal QskBoundedValueInput::boundaryLength() const
{ {
return m_data->maximum - m_data->minimum; return m_data->maximum - m_data->minimum;
} }
qreal QskBoundedValueControl::fixupValue( qreal value ) const qreal QskBoundedValueInput::fixupValue( qreal value ) const
{ {
return value; return value;
} }
void QskBoundedValueControl::setValueAsRatio( qreal ratio ) void QskBoundedValueInput::setValueAsRatio( qreal ratio )
{ {
ratio = qBound( 0.0, ratio, 1.0 ); ratio = qBound( 0.0, ratio, 1.0 );
setValue( m_data->minimum + ratio * ( m_data->maximum - m_data->minimum ) ); setValue( m_data->minimum + ratio * ( m_data->maximum - m_data->minimum ) );
} }
qreal QskBoundedValueControl::valueAsRatio() const qreal QskBoundedValueInput::valueAsRatio() const
{ {
return ( m_data->value - m_data->minimum ) / ( m_data->maximum - m_data->minimum ); return ( m_data->value - m_data->minimum ) / ( m_data->maximum - m_data->minimum );
} }
void QskBoundedValueControl::setValue( qreal value ) void QskBoundedValueInput::setValue( qreal value )
{ {
if ( isComponentComplete() ) if ( isComponentComplete() )
{ {
@ -192,12 +192,12 @@ void QskBoundedValueControl::setValue( qreal value )
} }
} }
qreal QskBoundedValueControl::value() const qreal QskBoundedValueInput::value() const
{ {
return m_data->value; return m_data->value;
} }
void QskBoundedValueControl::setStepSize( qreal stepSize ) void QskBoundedValueInput::setStepSize( qreal stepSize )
{ {
if ( qskFuzzyCompare( m_data->stepSize, stepSize ) ) if ( qskFuzzyCompare( m_data->stepSize, stepSize ) )
return; return;
@ -208,12 +208,12 @@ void QskBoundedValueControl::setStepSize( qreal stepSize )
update(); update();
} }
qreal QskBoundedValueControl::stepSize() const qreal QskBoundedValueInput::stepSize() const
{ {
return m_data->stepSize; return m_data->stepSize;
} }
void QskBoundedValueControl::setPageSize( int pageSize ) void QskBoundedValueInput::setPageSize( int pageSize )
{ {
if ( m_data->pageSize == pageSize ) if ( m_data->pageSize == pageSize )
return; return;
@ -224,12 +224,12 @@ void QskBoundedValueControl::setPageSize( int pageSize )
update(); update();
} }
int QskBoundedValueControl::pageSize() const int QskBoundedValueInput::pageSize() const
{ {
return m_data->pageSize; return m_data->pageSize;
} }
void QskBoundedValueControl::setSnap( bool snap ) void QskBoundedValueInput::setSnap( bool snap )
{ {
if ( m_data->snap == snap ) if ( m_data->snap == snap )
return; return;
@ -243,12 +243,12 @@ void QskBoundedValueControl::setSnap( bool snap )
} }
} }
bool QskBoundedValueControl::snap() const bool QskBoundedValueInput::snap() const
{ {
return m_data->snap; return m_data->snap;
} }
void QskBoundedValueControl::setReadOnly( bool readOnly ) void QskBoundedValueInput::setReadOnly( bool readOnly )
{ {
if ( readOnly == isReadOnly() ) if ( readOnly == isReadOnly() )
return; return;
@ -263,32 +263,32 @@ void QskBoundedValueControl::setReadOnly( bool readOnly )
Q_EMIT readOnlyChanged( readOnly ); Q_EMIT readOnlyChanged( readOnly );
} }
bool QskBoundedValueControl::isReadOnly() const bool QskBoundedValueInput::isReadOnly() const
{ {
return skinState() & ReadOnly; return skinState() & ReadOnly;
} }
void QskBoundedValueControl::stepUp() void QskBoundedValueInput::stepUp()
{ {
setValue( m_data->value + m_data->stepSize ); setValue( m_data->value + m_data->stepSize );
} }
void QskBoundedValueControl::stepDown() void QskBoundedValueInput::stepDown()
{ {
setValue( m_data->value - m_data->stepSize ); setValue( m_data->value - m_data->stepSize );
} }
void QskBoundedValueControl::pageUp() void QskBoundedValueInput::pageUp()
{ {
setValue( m_data->value + m_data->stepSize * m_data->pageSize ); setValue( m_data->value + m_data->stepSize * m_data->pageSize );
} }
void QskBoundedValueControl::pageDown() void QskBoundedValueInput::pageDown()
{ {
setValue( m_data->value - m_data->stepSize * m_data->pageSize ); setValue( m_data->value - m_data->stepSize * m_data->pageSize );
} }
void QskBoundedValueControl::keyPressEvent( QKeyEvent* event ) void QskBoundedValueInput::keyPressEvent( QKeyEvent* event )
{ {
if ( !isReadOnly() ) if ( !isReadOnly() )
{ {
@ -310,7 +310,7 @@ void QskBoundedValueControl::keyPressEvent( QKeyEvent* event )
#ifndef QT_NO_WHEELEVENT #ifndef QT_NO_WHEELEVENT
void QskBoundedValueControl::wheelEvent( QWheelEvent* event ) void QskBoundedValueInput::wheelEvent( QWheelEvent* event )
{ {
if ( isReadOnly() ) if ( isReadOnly() )
return; return;
@ -329,10 +329,10 @@ void QskBoundedValueControl::wheelEvent( QWheelEvent* event )
#endif #endif
void QskBoundedValueControl::componentComplete() void QskBoundedValueInput::componentComplete()
{ {
Inherited::componentComplete(); Inherited::componentComplete();
adjustBoundariesAndValue( true ); adjustBoundariesAndValue( true );
} }
#include "moc_QskBoundedValueControl.cpp" #include "moc_QskBoundedValueInput.cpp"

10
src/controls/QskBoundedValueControl.h → src/controls/QskBoundedValueInput.h
View File

@ -3,14 +3,14 @@
* This file may be used under the terms of the QSkinny License, Version 1.0 * This file may be used under the terms of the QSkinny License, Version 1.0
*****************************************************************************/ *****************************************************************************/
#ifndef QSK_BOUNDED_VALUE_CONTROL_H #ifndef QSK_BOUNDED_VALUE_INPUT_H
#define QSK_BOUNDED_VALUE_CONTROL_H #define QSK_BOUNDED_VALUE_INPUT_H
#include "QskControl.h" #include "QskControl.h"
class QskIntervalF; class QskIntervalF;
class QSK_EXPORT QskBoundedValueControl : public QskControl class QSK_EXPORT QskBoundedValueInput : public QskControl
{ {
Q_OBJECT Q_OBJECT
@ -32,8 +32,8 @@ class QSK_EXPORT QskBoundedValueControl : public QskControl
public: public:
QSK_STATES( ReadOnly ) QSK_STATES( ReadOnly )
QskBoundedValueControl( QQuickItem* parent = nullptr ); QskBoundedValueInput( QQuickItem* parent = nullptr );
~QskBoundedValueControl() override; ~QskBoundedValueInput() override;
qreal minimum() const; qreal minimum() const;
qreal maximum() const; qreal maximum() const;

6
src/controls/QskSlider.h
View File

@ -6,12 +6,12 @@
#ifndef QSK_SLIDER_H #ifndef QSK_SLIDER_H
#define QSK_SLIDER_H #define QSK_SLIDER_H
#include "QskBoundedValueControl.h" #include "QskBoundedValueInput.h"
class QSGNode; class QSGNode;
class QskSkin; class QskSkin;
class QSK_EXPORT QskSlider : public QskBoundedValueControl class QSK_EXPORT QskSlider : public QskBoundedValueInput
{ {
Q_OBJECT Q_OBJECT
@ -22,7 +22,7 @@ class QSK_EXPORT QskSlider : public QskBoundedValueControl
Q_PROPERTY( bool tracking READ isTracking WRITE setTracking NOTIFY trackingChanged ) Q_PROPERTY( bool tracking READ isTracking WRITE setTracking NOTIFY trackingChanged )
using Inherited = QskBoundedValueControl; using Inherited = QskBoundedValueInput;
public: public:
QSK_SUBCONTROLS( Panel, Groove, Fill, Scale, Handle ) QSK_SUBCONTROLS( Panel, Groove, Fill, Scale, Handle )

4
src/src.pro
View File

@ -110,7 +110,7 @@ HEADERS += \
controls/QskAbstractButton.h \ controls/QskAbstractButton.h \
controls/QskAnimationHint.h \ controls/QskAnimationHint.h \
controls/QskAnimator.h \ controls/QskAnimator.h \
controls/QskBoundedValueControl.h \ controls/QskBoundedValueInput.h \
controls/QskBox.h \ controls/QskBox.h \
controls/QskBoxSkinlet.h \ controls/QskBoxSkinlet.h \
controls/QskControl.h \ controls/QskControl.h \
@ -178,7 +178,7 @@ HEADERS += \
SOURCES += \ SOURCES += \
controls/QskAbstractButton.cpp \ controls/QskAbstractButton.cpp \
controls/QskAnimator.cpp \ controls/QskAnimator.cpp \
controls/QskBoundedValueControl.cpp \ controls/QskBoundedValueInput.cpp \
controls/QskBox.cpp \ controls/QskBox.cpp \
controls/QskBoxSkinlet.cpp \ controls/QskBoxSkinlet.cpp \
controls/QskControl.cpp \ controls/QskControl.cpp \