Add 'mirror' property to Image element.

Setting mirror to true will horizontally invert an image. This feature
is part of the task to support RTL in QML (see QTBUG-11042).

Task-number: QTBUG-15878
Reviewed-by: Joona Petrell

6 files changed, 114 insertions, 49 deletions

diff --git a/src/declarative/graphicsitems/qdeclarativeanimatedimage.cpp b/src/declarative/graphicsitems/qdeclarativeanimatedimage.cpp
index 12a820f..abdfdfa 100644
--- a/src/declarative/graphicsitems/qdeclarativeanimatedimage.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeanimatedimage.cpp
@@ -86,6 +86,16 @@ QT_BEGIN_NAMESPACE
     \sa BorderImage, Image
 */
 
+/*!
+    \qmlproperty bool AnimatedImage::mirror
+    \since Quick 1.1
+
+    This property holds whether the image should be horizontally inverted
+    (effectively displaying a mirrored image).
+
+    The default value is false.
+*/
+
 QDeclarativeAnimatedImage::QDeclarativeAnimatedImage(QDeclarativeItem *parent)
     : QDeclarativeImage(*(new QDeclarativeAnimatedImagePrivate), parent)
 {
@@ -126,7 +136,7 @@ void QDeclarativeAnimatedImage::setPaused(bool pause)
   \qmlproperty bool AnimatedImage::playing
   This property holds whether the animated image is playing.
 
-  By defaults, this property is true, meaning that the animation
+  By default, this property is true, meaning that the animation
   will start playing immediately.
 */
 bool QDeclarativeAnimatedImage::isPlaying() const
diff --git a/src/declarative/graphicsitems/qdeclarativeborderimage.cpp b/src/declarative/graphicsitems/qdeclarativeborderimage.cpp
index 0bf09ad..a25074a 100644
--- a/src/declarative/graphicsitems/qdeclarativeborderimage.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeborderimage.cpp
@@ -200,6 +200,16 @@ QDeclarativeBorderImage::~QDeclarativeBorderImage()
 */
 
 /*!
+    \qmlproperty bool BorderImage::mirror
+    \since Quick 1.1
+
+    This property holds whether the image should be horizontally inverted
+    (effectively displaying a mirrored image).
+
+    The default value is false.
+*/
+
+/*!
     \qmlproperty url BorderImage::source
 
     This property holds the URL that refers to the source image.
@@ -534,8 +544,15 @@ void QDeclarativeBorderImage::paint(QPainter *p, const QStyleOptionGraphicsItem
 
     bool oldAA = p->testRenderHint(QPainter::Antialiasing);
     bool oldSmooth = p->testRenderHint(QPainter::SmoothPixmapTransform);
+    QTransform oldTransform;
     if (d->smooth)
         p->setRenderHints(QPainter::Antialiasing | QPainter::SmoothPixmapTransform, d->smooth);
+    if (d->mirror) {
+        oldTransform = p->transform();
+        QTransform mirror;
+        mirror.translate(d->width(), 0).scale(-1, 1.0);
+        p->setWorldTransform(mirror * oldTransform);
+    }
 
     const QDeclarativeScaleGrid *border = d->getScaleGrid();
     int left = border->left();
@@ -561,6 +578,8 @@ void QDeclarativeBorderImage::paint(QPainter *p, const QStyleOptionGraphicsItem
         p->setRenderHint(QPainter::Antialiasing, oldAA);
         p->setRenderHint(QPainter::SmoothPixmapTransform, oldSmooth);
     }
+    if (d->mirror)
+        p->setWorldTransform(oldTransform);
 }
 
 QT_END_NAMESPACE
diff --git a/src/declarative/graphicsitems/qdeclarativeimage.cpp b/src/declarative/graphicsitems/qdeclarativeimage.cpp
index e07292b..68a1ecb 100644
--- a/src/declarative/graphicsitems/qdeclarativeimage.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeimage.cpp
@@ -467,84 +467,93 @@ QRectF QDeclarativeImage::boundingRect() const
     to make sure that they aren't cached at the expense of small 'ui element' images.
 */
 
+/*!
+    \qmlproperty bool Image::mirror
+    \since Quick 1.1
+
+    This property holds whether the image should be horizontally inverted
+    (effectively displaying a mirrored image).
+
+    The default value is false.
+*/
+
+
 void QDeclarativeImage::paint(QPainter *p, const QStyleOptionGraphicsItem *, QWidget *)
 {
     Q_D(QDeclarativeImage);
     if (d->pix.pixmap().isNull() )
         return;
 
-    bool oldAA = p->testRenderHint(QPainter::Antialiasing);
-    bool oldSmooth = p->testRenderHint(QPainter::SmoothPixmapTransform);
-    if (d->smooth)
-        p->setRenderHints(QPainter::Antialiasing | QPainter::SmoothPixmapTransform, d->smooth);
+    int drawWidth = width();
+    int drawHeight = height();
+    bool doClip = false;
+    QTransform transform;
+    qreal widthScale = width() / qreal(d->pix.width());
+    qreal heightScale = height() / qreal(d->pix.height());
 
     if (width() != d->pix.width() || height() != d->pix.height()) {
         if (d->fillMode >= Tile) {
-            if (d->fillMode == Tile) {
-                p->drawTiledPixmap(QRectF(0,0,width(),height()), d->pix);
-            } else {
-                qreal widthScale = width() / qreal(d->pix.width());
-                qreal heightScale = height() / qreal(d->pix.height());
-
-                QTransform scale;
-                if (d->fillMode == TileVertically) {
-                    scale.scale(widthScale, 1.0);
-                    QTransform old = p->transform();
-                    p->setWorldTransform(scale * old);
-                    p->drawTiledPixmap(QRectF(0,0,d->pix.width(),height()), d->pix);
-                    p->setWorldTransform(old);
-                } else {
-                    scale.scale(1.0, heightScale);
-                    QTransform old = p->transform();
-                    p->setWorldTransform(scale * old);
-                    p->drawTiledPixmap(QRectF(0,0,width(),d->pix.height()), d->pix);
-                    p->setWorldTransform(old);
-                }
+            if (d->fillMode == TileVertically) {
+                transform.scale(widthScale, 1.0);
+                drawWidth = d->pix.width();
+            } else if (d->fillMode == TileHorizontally) {
+                transform.scale(1.0, heightScale);
+                drawHeight = d->pix.height();
             }
         } else {
-            qreal widthScale = width() / qreal(d->pix.width());
-            qreal heightScale = height() / qreal(d->pix.height());
-
-            QTransform scale;
-
             if (d->fillMode == PreserveAspectFit) {
                 if (widthScale <= heightScale) {
                     heightScale = widthScale;
-                    scale.translate(0, (height() - heightScale * d->pix.height()) / 2);
+                    transform.translate(0, (height() - heightScale * d->pix.height()) / 2);
                 } else if(heightScale < widthScale) {
                     widthScale = heightScale;
-                    scale.translate((width() - widthScale * d->pix.width()) / 2, 0);
+                    transform.translate((width() - widthScale * d->pix.width()) / 2, 0);
                 }
             } else if (d->fillMode == PreserveAspectCrop) {
                 if (widthScale < heightScale) {
                     widthScale = heightScale;
-                    scale.translate((width() - widthScale * d->pix.width()) / 2, 0);
+                    transform.translate((width() - widthScale * d->pix.width()) / 2, 0);
                 } else if(heightScale < widthScale) {
                     heightScale = widthScale;
-                    scale.translate(0, (height() - heightScale * d->pix.height()) / 2);
+                    transform.translate(0, (height() - heightScale * d->pix.height()) / 2);
                 }
             }
-            if (clip()) {
-                p->save();
-                p->setClipRect(QRectF(0, 0, d->mWidth, d->mHeight), Qt::IntersectClip);
-            }
-            scale.scale(widthScale, heightScale);
-            QTransform old = p->transform();
-            p->setWorldTransform(scale * old);
-            p->drawPixmap(0, 0, d->pix);
-            p->setWorldTransform(old);
-            if (clip()) {
-                p->restore();
-            }
+            transform.scale(widthScale, heightScale);
+            drawWidth = d->pix.width();
+            drawHeight = d->pix.height();
+            doClip = clip();
         }
-    } else {
-        p->drawPixmap(0, 0, d->pix);
     }
 
+    QTransform oldTransform;
+    bool oldAA = p->testRenderHint(QPainter::Antialiasing);
+    bool oldSmooth = p->testRenderHint(QPainter::SmoothPixmapTransform);
+    if (d->smooth)
+        p->setRenderHints(QPainter::Antialiasing | QPainter::SmoothPixmapTransform, d->smooth);
+    if (doClip) {
+        p->save();
+        p->setClipRect(QRectF(0, 0, d->mWidth, d->mHeight), Qt::IntersectClip);
+    }
+    if (d->mirror)
+        transform.translate(drawWidth, 0).scale(-1.0, 1.0);
+    if (!transform.isIdentity()) {
+        oldTransform = p->transform();
+        p->setWorldTransform(transform * oldTransform);
+    }
+
+    if (d->fillMode >= Tile)
+        p->drawTiledPixmap(QRectF(0, 0, drawWidth, drawHeight), d->pix);
+    else
+        p->drawPixmap(QRectF(0, 0, drawWidth, drawHeight), d->pix, QRectF(0, 0, drawWidth, drawHeight));
+
     if (d->smooth) {
         p->setRenderHint(QPainter::Antialiasing, oldAA);
         p->setRenderHint(QPainter::SmoothPixmapTransform, oldSmooth);
     }
+    if (doClip)
+        p->restore();
+    if (!transform.isIdentity())
+        p->setWorldTransform(oldTransform);
 }
 
 void QDeclarativeImage::pixmapChange()
diff --git a/src/declarative/graphicsitems/qdeclarativeimagebase.cpp b/src/declarative/graphicsitems/qdeclarativeimagebase.cpp
index 37b0734..c745635 100644
--- a/src/declarative/graphicsitems/qdeclarativeimagebase.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeimagebase.cpp
@@ -146,6 +146,26 @@ void QDeclarativeImageBase::setCached(bool cached)
         load();
 }
 
+void QDeclarativeImageBase::setMirror(bool mirror)
+{
+    Q_D(QDeclarativeImageBase);
+    if (mirror == d->mirror)
+        return;
+
+    d->mirror = mirror;
+
+    if (isComponentComplete())
+        update();
+
+    emit mirrorChanged();
+}
+
+bool QDeclarativeImageBase::mirror() const
+{
+    Q_D(const QDeclarativeImageBase);
+    return d->mirror;
+}
+
 void QDeclarativeImageBase::load()
 {
     Q_D(QDeclarativeImageBase);
diff --git a/src/declarative/graphicsitems/qdeclarativeimagebase_p.h b/src/declarative/graphicsitems/qdeclarativeimagebase_p.h
index d25f7c3..b6e55ec 100644
--- a/src/declarative/graphicsitems/qdeclarativeimagebase_p.h
+++ b/src/declarative/graphicsitems/qdeclarativeimagebase_p.h
@@ -60,6 +60,7 @@ class Q_AUTOTEST_EXPORT QDeclarativeImageBase : public QDeclarativeItem
     Q_PROPERTY(bool asynchronous READ asynchronous WRITE setAsynchronous NOTIFY asynchronousChanged)
     Q_PROPERTY(bool cached READ cached WRITE setCached NOTIFY cachedChanged) // ### VERSIONING: Only in QtQuick 1.1
     Q_PROPERTY(QSize sourceSize READ sourceSize WRITE setSourceSize NOTIFY sourceSizeChanged)
+    Q_PROPERTY(bool mirror READ mirror WRITE setMirror NOTIFY mirrorChanged) // ### VERSIONING: Only in QtQuick 1.1
 
 public:
     ~QDeclarativeImageBase();
@@ -79,6 +80,9 @@ public:
     virtual void setSourceSize(const QSize&);
     QSize sourceSize() const;
 
+    virtual void setMirror(bool mirror);
+    bool mirror() const;
+
 Q_SIGNALS:
     void sourceChanged(const QUrl &);
     void sourceSizeChanged();
@@ -86,6 +90,7 @@ Q_SIGNALS:
     void progressChanged(qreal progress);
     void asynchronousChanged();
     void cachedChanged();
+    void mirrorChanged();
 
 protected:
     virtual void load();
diff --git a/src/declarative/graphicsitems/qdeclarativeimagebase_p_p.h b/src/declarative/graphicsitems/qdeclarativeimagebase_p_p.h
index a539649..950914f 100644
--- a/src/declarative/graphicsitems/qdeclarativeimagebase_p_p.h
+++ b/src/declarative/graphicsitems/qdeclarativeimagebase_p_p.h
@@ -71,7 +71,8 @@ public:
         progress(0.0),
         explicitSourceSize(false),
         async(false),
-        cached(true)
+        cached(true),
+        mirror(false)
     {
         QGraphicsItemPrivate::flags = QGraphicsItemPrivate::flags & ~QGraphicsItem::ItemHasNoContents;
     }
@@ -84,6 +85,7 @@ public:
     bool explicitSourceSize : 1;
     bool async : 1;
     bool cached : 1;
+    bool mirror: 1;
 };
 
 QT_END_NAMESPACE