some fixes

This commit is contained in:
Uwe Rathmann 2017-12-22 14:15:24 +01:00
parent 6e724b465c
commit 95ffcdaa23
6 changed files with 19 additions and 3 deletions

View File

@ -37,7 +37,6 @@ public:
WordWrap = QTextOption::WordWrap,
WrapAnywhere = QTextOption::WrapAnywhere,
Wrap = QTextOption::WrapAtWordBoundaryOrAnywhere
};
Q_ENUM( WrapMode )

View File

@ -44,7 +44,7 @@ bool QskGeometryChangeEvent::isMoved() const
( m_rect.y() != m_oldRect.y() );
}
// -- QskGeometryChangeEvent
// -- QskWindowChangeEvent
QskWindowChangeEvent::QskWindowChangeEvent(
QQuickWindow* oldWindow, QQuickWindow* window ):

View File

@ -338,6 +338,8 @@ QString QskInputPanel::displayLanguageName() const
default:
return QStringLiteral( "English (UK)" );
}
break;
}
case QLocale::Spanish:

View File

@ -278,6 +278,9 @@ void QskRangeControl::keyPressEvent( QKeyEvent* event )
void QskRangeControl::wheelEvent( QWheelEvent* event )
{
if( isReadOnly() )
return;
const int steps = event->delta() / 120;
setValue( m_data->value + steps * m_data->stepSize );
}

View File

@ -99,6 +99,9 @@ void QskVariantAnimator::advance( qreal progress )
{
if ( m_interpolator )
{
if ( qFuzzyCompare( progress, 1.0 ) )
progress = 1.0;
m_currentValue = qskInterpolate( m_interpolator,
m_startValue, m_endValue, progress );
}

View File

@ -54,8 +54,17 @@ public:
};
//! Attributes of a state change
struct StateData
class StateData
{
public:
StateData():
backgroundMode( Qt::TransparentMode ),
clipOperation( Qt::NoClip ),
isClipEnabled( false ),
compositionMode( QPainter::CompositionMode_SourceOver )
{
}
QPaintEngine::DirtyFlags flags;
QPen pen;