Merge lp:~loic.molinari/ubuntu-ui-toolkit/ubuntu-ui-toolkit-ubuntushape-alignment-fix into lp:ubuntu-ui-toolkit

[Loïc Molinari]

[UbuntuShape] Fixed alignment support.

[UbuntuShape] Fixed alignment support.

[lp:~loic.molinari/ubuntu-ui-toolkit/ubuntu-ui-toolkit-ubuntushape-alignment-fix]

599. By Loïc Molinari on 2013-07-09

Fixed typo.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:598
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/295/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/897/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/152/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/152
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/152/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/901/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/295/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:599
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/296/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/903
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/153
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/153
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/153/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/907
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/907/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/775

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/296/rebuild

review: Approve (continuous-integration)

=== modified file 'modules/Ubuntu/Components/plugin/shapeitem.cpp'
--- modules/Ubuntu/Components/plugin/shapeitem.cpp	2013-07-09 15:21:04 +0000
+++ modules/Ubuntu/Components/plugin/shapeitem.cpp	2013-07-09 17:07:27 +0000
@@ -231,6 +231,8 @@
 
 void ShapeItem::updateFromImageProperties(QQuickItem* image)
 {
+    int alignment;
+
     // ShapeItem::stretched depends on image::fillMode
     QQuickImage::FillMode fillMode = (QQuickImage::FillMode)image->property("fillMode").toInt();
     if (fillMode == QQuickImage::PreserveAspectCrop) {
@@ -240,12 +242,26 @@
     }
 
     // ShapeItem::horizontalAlignment depends on image::horizontalAlignment
-    QQuickImage::HAlignment horizontalAlignment = (QQuickImage::HAlignment)image->property("horizontalAlignment").toInt();
-    setHorizontalAlignment((ShapeItem::HAlignment)horizontalAlignment);
+    int imageHorizontalAlignment = image->property("horizontalAlignment").toInt();
+    if (imageHorizontalAlignment == Qt::AlignLeft) {
+        alignment = ShapeItem::AlignLeft;
+    } else if (imageHorizontalAlignment == Qt::AlignRight) {
+        alignment = ShapeItem::AlignRight;
+    } else {
+        alignment = ShapeItem::AlignHCenter;
+    }
+    setHorizontalAlignment(static_cast<ShapeItem::HAlignment>(alignment));
 
     // ShapeItem::verticalAlignment depends on image::verticalAlignment
-    QQuickImage::VAlignment verticalAlignment = (QQuickImage::VAlignment)image->property("verticalAlignment").toInt();
-    setVerticalAlignment((ShapeItem::VAlignment)verticalAlignment);
+    int imageVerticalAlignment = image->property("verticalAlignment").toInt();
+    if (imageVerticalAlignment == Qt::AlignTop) {
+        alignment = ShapeItem::AlignTop;
+    } else if (imageVerticalAlignment == Qt::AlignBottom) {
+        alignment = ShapeItem::AlignBottom;
+    } else {
+        alignment = ShapeItem::AlignVCenter;
+    }
+    setVerticalAlignment(static_cast<ShapeItem::VAlignment>(alignment));
 }
 
 void ShapeItem::connectToPropertyChange(QObject* sender, const char* property,
@@ -274,7 +290,6 @@
     updateFromImageProperties(image);
 }
 
-
 void ShapeItem::setStretched(bool stretched)
 {
     if (stretched_ != stretched) {

=== modified file 'modules/Ubuntu/Components/plugin/shapeitem.h'
--- modules/Ubuntu/Components/plugin/shapeitem.h	2013-07-01 12:54:42 +0000
+++ modules/Ubuntu/Components/plugin/shapeitem.h	2013-07-09 17:07:27 +0000
@@ -47,8 +47,8 @@
 
     enum Radius { SmallRadius, MediumRadius };
     enum Border { RawBorder, IdleBorder, PressedBorder };
-    enum HAlignment { AlignLeft = Qt::AlignLeft, AlignHCenter = Qt::AlignHCenter, AlignRight = Qt::AlignRight };
-    enum VAlignment { AlignTop = Qt::AlignTop, AlignVCenter = Qt::AlignVCenter, AlignBottom = Qt::AlignBottom };
+    enum HAlignment { AlignLeft = 0, AlignHCenter = 1, AlignRight = 2 };
+    enum VAlignment { AlignTop = 0, AlignVCenter = 1, AlignBottom = 2 };
 
     QColor color() const { return color_; }
     void setColor(const QColor& color);