ARM compile++
qreal is float on ARM. svn path=/trunk/KDE/kdelibs/; revision=1057466
This commit is contained in:
parent
db8ece1921
commit
4493bbd4f7
@ -232,7 +232,7 @@ void AppletHandle::paint(QPainter *painter, const QStyleOptionGraphicsItem *opti
|
||||
1 - ((m_background->marginSize(RightMargin) + translation) / m_decorationRect.width());
|
||||
g.setColorAt(1.0, Qt::transparent);
|
||||
g.setColorAt(opaquePoint + 0.05, Qt::transparent);
|
||||
g.setColorAt(qMax(0.0, opaquePoint), transparencyColor);
|
||||
g.setColorAt(qMax(qreal(0), opaquePoint), transparencyColor);
|
||||
g.setColorAt(0.0, transparencyColor);
|
||||
}
|
||||
//complete panel
|
||||
|
@ -195,13 +195,13 @@ QPointF KineticScrolling::thresholdPosition(QPointF value) const
|
||||
if(d->minimum.x() >= 0) {
|
||||
d->cposition.setX(value.x());
|
||||
} else {
|
||||
d->cposition.setX(qBound(d->minimum.x(), d->maximum.x(), 0.0));
|
||||
d->cposition.setX(qBound(d->minimum.x(), d->maximum.x(), qreal(0)));
|
||||
}
|
||||
|
||||
if((-d->contentsSize.height() + d->viewportGeometry.height() - d->overshoot) >= 0) {
|
||||
d->cposition.setY(value.y());
|
||||
} else {
|
||||
d->cposition.setY(qBound(d->minimum.y(), d->maximum.y(), (qreal)d->overshoot));
|
||||
d->cposition.setY(qBound(d->minimum.y(), d->maximum.y(), qreal(d->overshoot)));
|
||||
}
|
||||
|
||||
return d->cposition;
|
||||
|
Loading…
x
Reference in New Issue
Block a user