some fixes
This commit is contained in:
parent
6e724b465c
commit
95ffcdaa23
@ -37,7 +37,6 @@ public:
|
|||||||
WordWrap = QTextOption::WordWrap,
|
WordWrap = QTextOption::WordWrap,
|
||||||
WrapAnywhere = QTextOption::WrapAnywhere,
|
WrapAnywhere = QTextOption::WrapAnywhere,
|
||||||
Wrap = QTextOption::WrapAtWordBoundaryOrAnywhere
|
Wrap = QTextOption::WrapAtWordBoundaryOrAnywhere
|
||||||
|
|
||||||
};
|
};
|
||||||
Q_ENUM( WrapMode )
|
Q_ENUM( WrapMode )
|
||||||
|
|
||||||
|
@ -44,7 +44,7 @@ bool QskGeometryChangeEvent::isMoved() const
|
|||||||
( m_rect.y() != m_oldRect.y() );
|
( m_rect.y() != m_oldRect.y() );
|
||||||
}
|
}
|
||||||
|
|
||||||
// -- QskGeometryChangeEvent
|
// -- QskWindowChangeEvent
|
||||||
|
|
||||||
QskWindowChangeEvent::QskWindowChangeEvent(
|
QskWindowChangeEvent::QskWindowChangeEvent(
|
||||||
QQuickWindow* oldWindow, QQuickWindow* window ):
|
QQuickWindow* oldWindow, QQuickWindow* window ):
|
||||||
|
@ -338,6 +338,8 @@ QString QskInputPanel::displayLanguageName() const
|
|||||||
default:
|
default:
|
||||||
return QStringLiteral( "English (UK)" );
|
return QStringLiteral( "English (UK)" );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
case QLocale::Spanish:
|
case QLocale::Spanish:
|
||||||
|
@ -278,6 +278,9 @@ void QskRangeControl::keyPressEvent( QKeyEvent* event )
|
|||||||
|
|
||||||
void QskRangeControl::wheelEvent( QWheelEvent* event )
|
void QskRangeControl::wheelEvent( QWheelEvent* event )
|
||||||
{
|
{
|
||||||
|
if( isReadOnly() )
|
||||||
|
return;
|
||||||
|
|
||||||
const int steps = event->delta() / 120;
|
const int steps = event->delta() / 120;
|
||||||
setValue( m_data->value + steps * m_data->stepSize );
|
setValue( m_data->value + steps * m_data->stepSize );
|
||||||
}
|
}
|
||||||
|
@ -99,6 +99,9 @@ void QskVariantAnimator::advance( qreal progress )
|
|||||||
{
|
{
|
||||||
if ( m_interpolator )
|
if ( m_interpolator )
|
||||||
{
|
{
|
||||||
|
if ( qFuzzyCompare( progress, 1.0 ) )
|
||||||
|
progress = 1.0;
|
||||||
|
|
||||||
m_currentValue = qskInterpolate( m_interpolator,
|
m_currentValue = qskInterpolate( m_interpolator,
|
||||||
m_startValue, m_endValue, progress );
|
m_startValue, m_endValue, progress );
|
||||||
}
|
}
|
||||||
|
@ -54,8 +54,17 @@ public:
|
|||||||
};
|
};
|
||||||
|
|
||||||
//! Attributes of a state change
|
//! 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;
|
QPaintEngine::DirtyFlags flags;
|
||||||
|
|
||||||
QPen pen;
|
QPen pen;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user