Merge lp:~loic.molinari/ubuntu-ui-toolkit/ubuntu-ui-toolkit-big-radius into lp:ubuntu-ui-toolkit/staging

[Loïc Molinari]

[UbuntuShape] Added a big radius.

[UbuntuShape] Added a big radius.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1569
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2020/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/748
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/750
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/750/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/747

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2020/rebuild

review: Approve (continuous-integration)

[Zsombor Egri (zsombi)]

Looks good, thanks!

review: Approve

=== modified file 'modules/Ubuntu/Components/plugin/ucubuntushape.cpp'
--- modules/Ubuntu/Components/plugin/ucubuntushape.cpp	2015-06-02 13:37:30 +0000
+++ modules/Ubuntu/Components/plugin/ucubuntushape.cpp	2015-07-22 09:27:27 +0000
@@ -250,8 +250,7 @@
 
 const float implicitWidthGU = 8.0f;
 const float implicitHeightGU = 8.0f;
-const float smallRadiusGU = 1.45f;
-const float mediumRadiusGU = 2.55f;
+const float radiusGuMap[3] = { 1.45f, 2.55f, 3.65f };
 
 /*! \qmltype UbuntuShape
     \instantiates UCUbuntuShape
@@ -328,12 +327,12 @@
 
 /*! \qmlproperty string UbuntuShape::radius
 
-    This property defines the corner radius. Two fixed values are supported: \c "small" and \c
-    "medium". The default value is \c "small".
+    This property defines the corner radius. Three fixed values are supported: \c "small",
+    \c "medium" and \c "large". The default value is \c "small".
 */
 void UCUbuntuShape::setRadius(const QString& radius)
 {
-    const Radius newRadius = (radius == "medium") ? Medium : Small;
+  const Radius newRadius = (radius == "medium") ? Medium : ((radius == "large") ? Large : Small);
     if (m_radius != newRadius) {
         m_radius = newRadius;
         update();
@@ -1133,8 +1132,7 @@
     // scaled down accordingly. The shape was using a fixed image for the corner before switching to
     // a distance field, since the corner wasn't taking the whole image (ending at ~80%) we need
     // to take that into account when the size is scaled down.
-    float radius = UCUnits::instance().gridUnit()
-        * (m_radius == Small ? smallRadiusGU : mediumRadiusGU);
+    float radius = UCUnits::instance().gridUnit() * radiusGuMap[m_radius];
     const float scaledDownRadius = qMin(itemSize.width(), itemSize.height()) * 0.5f * 0.8f;
     if (radius > scaledDownRadius) {
         radius = scaledDownRadius;
 
=== modified file 'modules/Ubuntu/Components/plugin/ucubuntushape.h'
--- modules/Ubuntu/Components/plugin/ucubuntushape.h	2015-06-02 13:37:30 +0000
+++ modules/Ubuntu/Components/plugin/ucubuntushape.h	2015-07-22 09:27:27 +0000
@@ -183,7 +183,8 @@
     enum FillMode { Stretch = 0, PreserveAspectFit = 1, PreserveAspectCrop = 2, Pad = 3 };
     enum WrapMode { Transparent = 0, Repeat = 1 };
 
-    QString radius() const { return (m_radius == Small) ? "small" : "medium"; }
+    QString radius() const {
+      return (m_radius == Small) ? "small" : ((m_radius == Medium) ? "medium" : "large"); }
     void setRadius(const QString& radius);
     Aspect aspect() const { return (m_flags & AspectSet) ? static_cast<Aspect>(m_aspect) : Flat; }
     void setAspect(Aspect aspect);
@@ -305,7 +306,7 @@
         float itemWidth, float itemHeight, FillMode fillMode, HAlignment horizontalAlignment,
         VAlignment verticalAlignment, const QSize& textureSize);
 
-    enum Radius { Small = 0, Medium = 1 };
+    enum Radius { Small = 0, Medium = 1, Large = 2 };
     enum { Pressed = 2 };  // Aspect extension (to keep support for deprecated aspects).
     enum {
         AspectSet            = (1 << 0),
@@ -323,7 +324,7 @@
     QVector2D m_sourceScale;
     QVector2D m_sourceTranslation;
     QVector4D m_sourceTransform;
-    Radius m_radius : 1;
+    Radius m_radius : 2;
     quint8 m_aspect : 2;
     HAlignment m_imageHorizontalAlignment : 2;
     VAlignment m_imageVerticalAlignment : 2;
@@ -333,6 +334,7 @@
     FillMode m_sourceFillMode : 2;
     WrapMode m_sourceHorizontalWrapMode : 1;
     WrapMode m_sourceVerticalWrapMode : 1;
+    quint8 __explicit_padding : 7;
     quint8 m_sourceOpacity;
     quint8 m_flags;
 
 
=== modified file 'tests/resources/ubuntushape/UbuntuShapeOverlayTest.qml'
--- tests/resources/ubuntushape/UbuntuShapeOverlayTest.qml	2015-03-25 17:10:43 +0000
+++ tests/resources/ubuntushape/UbuntuShapeOverlayTest.qml	2015-07-22 09:27:27 +0000
@@ -221,7 +221,8 @@
 
         // Styling.
         } else if (event.key == Qt.Key_R) {
-            shape.radius = (shape.radius == "medium") ? "small" : "medium";
+            shape.radius = (shape.radius == "large") ? "small" :
+                ((shape.radius == "small") ? "medium" : "large");
         } else if (event.key == Qt.Key_T) {
             shape.aspect = (shape.aspect + 1) % 2;
 
 
=== modified file 'tests/resources/ubuntushape/UbuntuShapeTest.qml'
--- tests/resources/ubuntushape/UbuntuShapeTest.qml	2015-03-25 17:10:43 +0000
+++ tests/resources/ubuntushape/UbuntuShapeTest.qml	2015-07-22 09:27:27 +0000
@@ -218,7 +218,8 @@
 
         // Styling.
         } else if (event.key == Qt.Key_R) {
-            shape.radius = (shape.radius == "medium") ? "small" : "medium";
+            shape.radius = (shape.radius == "large") ? "small" :
+                ((shape.radius == "small") ? "medium" : "large");
         } else if (event.key == Qt.Key_T) {
             shape.aspect = (shape.aspect + 1) % 2;