FCL/sf/mw/hb: comparison src/hbcore/ovgeffects/hbvgreflectioneffect.cpp

equal deleted inserted replaced

-:11d3954df52a
+:627c4a0fd0e7
 /*!
 * \class HbVgReflectionEffect
 *
 * \brief OpenVG-based reflection effect.
 *
 * \internal
 */
 HbVgReflectionEffectPrivate::HbVgReflectionEffectPrivate()
 : fade(0), fadeInited(false)
 {
 }
 HbVgReflectionEffectPrivate::~HbVgReflectionEffectPrivate()
 {
 #ifdef HB_EFFECTS_OPENVG
 }
 void HbVgReflectionEffect::setOffset(const QPointF &offset)
 {
 Q_D(HbVgReflectionEffect);
-if (offset == d->offset)
+if (offset == d->offset) {
 return;
+}
 d->offset = offset;
 updateEffectBoundingRect();
 emit offsetChanged(offset);
 }
 * to be invisible, 1 shows nothing from the reflection (it is completely faded out).
 */
 void HbVgReflectionEffect::setFade(qreal fade)
 {
 Q_D(HbVgReflectionEffect);
-if (fade == d->fade)
+if (fade == d->fade) {
 return;
+}
 d->fade = fade;
 updateEffect();
 emit fadeChanged(fade);
 }
 }
 void HbVgReflectionEffect::setColor(const QColor &color)
 {
 Q_D(HbVgReflectionEffect);
-if (color == d->color)
+if (color == d->color) {
 return;
+}
 d->color = color;
 updateEffect();
 emit colorChanged(color);
 }
 {
 // Double the height of the rectangle but take also the offset into account.
 Q_D(const HbVgReflectionEffect);
 QRectF r(rect);
 QPointF mappedOffset = d->mapOffset(d->offset);
 qreal rotationAngle = d->mainWindowRotation();
-if (rotationAngle == 0)
+if (rotationAngle == 0) {
 r.adjust(0, 0, 0, r.height());
-else if (rotationAngle == 90 || rotationAngle == -270)
+} else if (rotationAngle == 90 || rotationAngle == -270) {
 r.adjust(-r.width(), 0, 0, 0);
-else if (rotationAngle == -90 || rotationAngle == 270)
+} else if (rotationAngle == -90 || rotationAngle == 270) {
 r.adjust(0, 0, r.width(), 0);
+}
 qreal x1 = qMin(r.left(), r.left() + mappedOffset.x());
 qreal y1 = qMin(r.top(), r.top() + mappedOffset.y());
 qreal x2 = qMax(r.right(), r.right() + mappedOffset.x());
 qreal y2 = qMax(r.bottom(), r.bottom() + mappedOffset.y());
 return QRectF(x1, y1, x2 - x1 + 1, y2 - y1 + 1);
 }
 void HbVgReflectionEffect::performEffect(QPainter *painter,
 const QPointF &offset,
 const QVariant &vgImage,
 const QSize &vgImageSize)
 {
 #ifdef HB_EFFECTS_OPENVG
 Q_D(HbVgReflectionEffect);
 if (d->hints & ForceFrameHint) {
 painter->restore();
 }
 QPaintDevice *pdev = painter->device();
 QRectF rectWithChildren = d->deviceRectForSource(
 HbVgFrameEffectPrivate::IncludeChildren,
 pdev);
 QRectF rectWithoutChildren = d->deviceRectForSource(
 HbVgFrameEffectPrivate::ExcludeChildren,
 pdev);
 VGImage srcImage = vgImage.value<VGImage>();
 VGImage dstImage = d->ensurePixmap(&d->dstPixmap, vgImageSize);
 // Draw the source pixmap using the painter, this will also set up the
 // IMAGE_USER_TO_SURFACE matrix.
 painter->drawPixmap(offset, d->srcPixmap);
 // Prepare the mirrored image.
 qreal rotationAngle = d->mainWindowRotation();
 qreal absRotationAngle = qAbs(rotationAngle);
 VGfloat m[9];
 vgGetMatrix(m);
 vgLoadIdentity();
-if (absRotationAngle == 0)
+if (absRotationAngle == 0) {
 m[4] *= -1.0f;
-else if (absRotationAngle == 90 || absRotationAngle == 270)
+} else if (absRotationAngle == 90 || absRotationAngle == 270) {
 m[0] *= -1.0f;
+}
 vgMultMatrix(m);
 // Must move the mirrored image to have it on top of the original and then down
 // again to have it below in portrait-mode. Rotation angles -90 or 270 causes image to be moved to right,
 // and in rotation angles -90 and 270, image is in correct place initially.
 // Try to take the exclude-children hint into account when performing the second move.
 VGfloat trans;
 if (absRotationAngle == 0) {
-if (d->hints & ExcludeChildrenHint)
+if (d->hints & ExcludeChildrenHint) {
 trans = -rectWithChildren.height() - rectWithoutChildren.height();
-else
+} else {
 trans = -2.0f * rectWithChildren.height();
+}
 vgTranslate(0.0f, trans);
-}
+} else if (absRotationAngle == 90 || absRotationAngle == 270) {
-else if (absRotationAngle == 90 || absRotationAngle == 270) {
+if (d->hints & ExcludeChildrenHint) {
-if (d->hints & ExcludeChildrenHint)
 trans = -rectWithChildren.width() - rectWithoutChildren.width();
-else
+} else {
 trans = -2.0f * rectWithChildren.width();
+}
 vgTranslate(trans, 0.0f);
 }
 // Apply the additional offset. Note: down = minus, right = plus.
 QPointF mappedOffset = d->mapOffset(d->offset);
 VGfloat ox = (VGfloat) mappedOffset.x();
 VGfloat oy = (VGfloat) mappedOffset.y();
-if (rotationAngle == 0)
+if (rotationAngle == 0) {
 vgTranslate(ox, -oy);
-else if (rotationAngle == 90 || rotationAngle == -270)
+} else if (rotationAngle == 90 || rotationAngle == -270) {
 vgTranslate(-ox, oy);
-else if (rotationAngle == -90 || rotationAngle == 270)
+} else if (rotationAngle == -90 || rotationAngle == 270) {
 vgTranslate(-ox, oy);
+}
 // Apply the opacity and the color. When no color was set and the opacity is 1, the
 // source image will be used as it is. This is the only place where we can try to use
 // the pixmap cache.
 VGImage imgToDraw = srcImage;
 QPixmap cachedPm = cached(vgImageSize);
 if (cachedPm.isNull()) {
 VGImage tmpImage = VG_INVALID_HANDLE;
 if (d->color.isValid()) {
 // Perform a colorize effect (ignore the opacity here because it must be set for
 // the full image, not just the color overlay).
 tmpImage = d->ensurePixmap(&d->tmpPixmap, vgImageSize);
 }
 qreal opacity = clamp(d->opacity, 0.0f, 1.0f);
 if (d->opacity < 1.0f - HBVG_EPSILON) {
 // Apply the opacity, i.e. modify the alpha channel.
 if (d->paramsChanged) {
-for (int i = 0; i < 256; ++i)
+for (int i = 0; i < 256; ++i) {
-d->alphaLUT[i] = (VGubyte) (i * opacity);
+d->alphaLUT[i] = (VGubyte)(i * opacity);
+}
 }
 vgLookup(dstImage, imgToDraw,
 identityLUT, identityLUT, identityLUT, d->alphaLUT,
 VG_TRUE, VG_FALSE);
 imgToDraw = dstImage;
 }
 // If colorize and/or opacity was used then try to cache the result.
-if (imgToDraw == tmpImage)
+if (imgToDraw == tmpImage) {
 tryCache(d->tmpPixmap);
-else if (imgToDraw == dstImage)
+} else if (imgToDraw == dstImage) {
 tryCache(d->dstPixmap);
+}
 } else {
 imgToDraw = qPixmapToVGImage(cachedPm);
 }
 // Fade out the lower part of the mirrored image. Skip this if 'fade' is 0, i.e. there
 }
 // Set up the linear gradient based on the (transformed) size of the source.
 VGfloat sw = (VGfloat) rectWithChildren.width();
 VGfloat sh = (VGfloat) rectWithChildren.height();
 // must be bottom-up to get the proper effect
-if (rotationAngle == 0)  {
+if (absRotationAngle == 0) {
 VGfloat grad[] = { sw / 2.0f, sh,
-sw / 2.0f, 0.0f };
+sw / 2.0f, 0.0f
+};
 vgSetParameterfv(d->fadePaint, VG_PAINT_LINEAR_GRADIENT, 4, grad);
-}
+} else if (absRotationAngle == 90 || absRotationAngle == 270) {
-else if (rotationAngle == -90 || rotationAngle == 270){
 VGfloat grad[] = { sw, sh / 2.0f,
-0.0f, sh / 2.0f };
+0.0f, sh / 2.0f
+};
 vgSetParameterfv(d->fadePaint, VG_PAINT_LINEAR_GRADIENT, 4, grad);
 }
-else if (rotationAngle == 90 || rotationAngle == -270){
-VGfloat grad[] = { 0.0f, sh / 2.0f,
-sw, sh / 2.0f };
-vgSetParameterfv(d->fadePaint, VG_PAINT_LINEAR_GRADIENT, 4, grad);
-}
 // Draw the mirrored image by using the paint to get a gradual fade-out effect.
 vgSeti(VG_MATRIX_MODE, VG_MATRIX_FILL_PAINT_TO_USER);
 vgLoadIdentity();
 vgSetPaint(d->fadePaint, VG_FILL_PATH);

changeset 5	627c4a0fd0e7
parent 0	16d8024aca5e
child 7	923ff622b8b9