Merge lp:~fboucault/ubuntu-ui-toolkit/shape_fix_distortion into lp:ubuntu-ui-toolkit

[Florian Boucault]

UbuntuShape: fix slight distortion of image when set.

This distortion was quite disturbing when the content has text in it, as it is often the case in Popups and Popovers.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:434
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1047/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/./build=panda-pbuilder,distribution=quantal,flavor=armhf/1047
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/./build=pbuilder-master,distribution=quantal,flavor=amd64/1047
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/./build=pbuilder-master,distribution=quantal,flavor=i386/1047

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

review: Approve (continuous-integration)

[Florian Boucault (fboucault)]

I'm not sure at all it's the correct patch.

[Loïc Molinari (loic.molinari)]

You're right, there's a clearly a problem there. I wonder why I was subtracting 1 to the radius and size (width or height). I think the subtraction on the size that you kept should not even be there, I tested and it works correctly.

Now there's still another problem. I'm testing with a 512x512 image with an UbuntuShape of the same size with fillMode set to PreserveAspectCrop, if you set the width (or height) to an even value, the rendering is good, if you set it to an odd value the rendering is slightly stretched.

[Loïc Molinari (loic.molinari)]

Can you please remove the remaining substraction on the sizes?

I haven't found the reason of that even/odd size issue, I'll investigate later. Can you add a FIXME meanwhile? Something like:

// FIXME(loicm) With a NxM image, a preserve aspect crop fill mode and a width
// component size of N (or a height component size of M), changing the the
// height (or width) breaks the 1:1 texel/pixel mapping for odd values.

review: Needs Fixing

[Loïc Molinari (loic.molinari)]

Good

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:436
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1071/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/./build=panda-pbuilder,distribution=quantal,flavor=armhf/1071
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/./build=pbuilder-master,distribution=quantal,flavor=amd64/1071
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/./build=pbuilder-master,distribution=quantal,flavor=i386/1071

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
Approved revid is not set in launchpad (maybe a permission problem?).
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-autolanding/467/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-autolanding/./build=panda-pbuilder,distribution=quantal,flavor=armhf/467
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-autolanding/./build=pbuilder-master,distribution=quantal,flavor=amd64/467
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-autolanding/./build=pbuilder-master,distribution=quantal,flavor=i386/467

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:437
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1073/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/./build=panda-pbuilder,distribution=quantal,flavor=armhf/1073
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/./build=pbuilder-master,distribution=quantal,flavor=amd64/1073
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/./build=pbuilder-master,distribution=quantal,flavor=i386/1073

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:438
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1074/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/./build=panda-pbuilder,distribution=quantal,flavor=armhf/1074
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/./build=pbuilder-master,distribution=quantal,flavor=amd64/1074
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/./build=pbuilder-master,distribution=quantal,flavor=i386/1074

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-autolanding/468/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-autolanding/./build=panda-pbuilder,distribution=quantal,flavor=armhf/468
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-autolanding/./build=pbuilder-master,distribution=quantal,flavor=amd64/468
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-autolanding/./build=pbuilder-master,distribution=quantal,flavor=i386/468

review: Needs Fixing (continuous-integration)

[lp:~fboucault/ubuntu-ui-toolkit/shape_fix_distortion]

439. By Florian Boucault on 2013-04-26

QSKIP unit test for now.

440. By Florian Boucault on 2013-04-26

Fixed conflict

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:439
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1097/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/./build=panda-pbuilder,distribution=quantal,flavor=armhf/1097
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/./build=pbuilder-master,distribution=quantal,flavor=amd64/1097
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/./build=pbuilder-master,distribution=quantal,flavor=i386/1097

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

review: Approve (continuous-integration)

=== modified file 'modules/Ubuntu/Components/plugin/shapeitem.cpp'
--- modules/Ubuntu/Components/plugin/shapeitem.cpp	2013-04-25 15:09:49 +0000
+++ modules/Ubuntu/Components/plugin/shapeitem.cpp	2013-04-26 13:39:36 +0000
@@ -374,6 +374,9 @@
     float radiusCoordinateWidth;
     float radiusCoordinateHeight;
 
+    // FIXME(loicm) With a NxM image, a preserve aspect crop fill mode and a width
+    //     component size of N (or a height component size of M), changing the the
+    //     height (or width) breaks the 1:1 texel/pixel mapping for odd values.
     if (!stretched && texture) {
         // Preserve source image aspect ratio cropping areas exceeding destination rectangle.
         const float factors[3] = { 0.0f, 0.5f, 1.0f };
@@ -387,8 +390,8 @@
             bottomCoordinate = 1.0f;
             leftCoordinate = outCoordinateSize * factors[hAlignment];
             rightCoordinate = 1.0f - (outCoordinateSize * (1.0f - factors[hAlignment]));
-            radiusCoordinateHeight = (radius - 1.0f) / (height - 1.0f);
-            radiusCoordinateWidth = ((radius - 1.0f) / (width - 1.0f)) * inCoordinateSize;
+            radiusCoordinateHeight = radius / height;
+            radiusCoordinateWidth = (radius / width) * inCoordinateSize;
         } else {
             const float inCoordinateSize = srcRatio / dstRatio;
             const float outCoordinateSize = 1.0f - inCoordinateSize;
@@ -396,8 +399,8 @@
             bottomCoordinate = 1.0f - (outCoordinateSize * (1.0f - factors[vAlignment]));
             leftCoordinate = 0.0f;
             rightCoordinate = 1.0f;
-            radiusCoordinateHeight = ((radius - 1.0f) / (height - 1.0f)) * inCoordinateSize;
-            radiusCoordinateWidth = (radius - 1.0f) / (width - 1.0f);
+            radiusCoordinateHeight = (radius / height) * inCoordinateSize;
+            radiusCoordinateWidth = radius / width;
         }
     } else {
         // Don't preserve source image aspect ratio stretching it in destination rectangle.
@@ -405,8 +408,8 @@
         bottomCoordinate = 1.0f;
         leftCoordinate = 0.0f;
         rightCoordinate = 1.0f;
-        radiusCoordinateHeight = (radius - 1.0f) / (height - 1.0f);
-        radiusCoordinateWidth = (radius - 1.0f) / (width - 1.0f);
+        radiusCoordinateHeight = radius / height;
+        radiusCoordinateWidth = radius / width;
     }
 
     // Set top row of 4 vertices.

=== added directory 'tests/unit/tst_ubuntu_shape'
=== added file 'tests/unit/tst_ubuntu_shape/no_distortion.qml'
--- tests/unit/tst_ubuntu_shape/no_distortion.qml	1970-01-01 00:00:00 +0000
+++ tests/unit/tst_ubuntu_shape/no_distortion.qml	2013-04-26 13:39:36 +0000
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+
+Item {
+    width: 900
+    height: 500
+
+    Row {
+        spacing: 50
+        anchors.centerIn: parent
+
+        Image {
+            id: grid
+            source: "no_distortion_source.png"
+        }
+
+        Shape {
+            id: shape
+            width: grid.width
+            height: grid.height
+            image: grid
+        }
+    }
+}

=== added file 'tests/unit/tst_ubuntu_shape/no_distortion_expected.png'
Binary files tests/unit/tst_ubuntu_shape/no_distortion_expected.png	1970-01-01 00:00:00 +0000 and tests/unit/tst_ubuntu_shape/no_distortion_expected.png	2013-04-26 13:39:36 +0000 differ
=== added file 'tests/unit/tst_ubuntu_shape/no_distortion_source.png'
Binary files tests/unit/tst_ubuntu_shape/no_distortion_source.png	1970-01-01 00:00:00 +0000 and tests/unit/tst_ubuntu_shape/no_distortion_source.png	2013-04-26 13:39:36 +0000 differ
=== added file 'tests/unit/tst_ubuntu_shape/tst_ubuntu_shape.cpp'
--- tests/unit/tst_ubuntu_shape/tst_ubuntu_shape.cpp	1970-01-01 00:00:00 +0000
+++ tests/unit/tst_ubuntu_shape/tst_ubuntu_shape.cpp	2013-04-26 13:39:36 +0000
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Florian Boucault <[e-mail]>
+ */
+
+#include <QtTest/QtTest>
+#include <QtQuick/QQuickView>
+#include <QtQml/QQmlEngine>
+
+class tst_UbuntuShape: public QObject
+{
+    Q_OBJECT
+
+private:
+    QQuickView *m_quickView;
+
+private Q_SLOTS:
+
+    void initTestCase()
+    {
+        m_quickView = new QQuickView;
+        m_quickView->setGeometry(0, 0, 900, 500);
+        m_quickView->show();
+
+        // add modules folder so we have access to the plugin from QML
+        QQmlEngine *engine = m_quickView->engine();
+        QString modules("../../../modules");
+        QStringList imports = engine->importPathList();
+        imports.prepend(QDir(modules).absolutePath());
+        engine->setImportPathList(imports);
+    }
+
+    void noDistortion() {
+        QSKIP("This test passes on local machines but not in CI as it requires working OpenGL");
+        m_quickView->setSource(QUrl::fromLocalFile("no_distortion.qml"));
+        QCoreApplication::processEvents();
+
+        QImage result = m_quickView->grabWindow();
+        QVERIFY(!result.isNull());
+
+        QImage expected = QImage("no_distortion_expected.png");
+        QVERIFY(!expected.isNull());
+
+        QCOMPARE(result, expected);
+    }
+};
+
+QTEST_MAIN(tst_UbuntuShape)
+
+#include "tst_ubuntu_shape.moc"

=== added file 'tests/unit/tst_ubuntu_shape/tst_ubuntu_shape.pro'
--- tests/unit/tst_ubuntu_shape/tst_ubuntu_shape.pro	1970-01-01 00:00:00 +0000
+++ tests/unit/tst_ubuntu_shape/tst_ubuntu_shape.pro	2013-04-26 13:39:36 +0000
@@ -0,0 +1,5 @@
+include(../test-include.pri)
+SOURCES += tst_ubuntu_shape.cpp
+OTHER_FILES += no_distortion.qml \
+               no_distortion_source.png \
+               no_distortion_expected.png

=== modified file 'tests/unit/unit.pro'
--- tests/unit/unit.pro	2013-04-22 15:38:15 +0000
+++ tests/unit/unit.pro	2013-04-26 13:39:36 +0000
@@ -27,4 +27,5 @@
     tst_theme_engine_stylecache \
     tst_theme_engine_style \
     tst_inversemousearea \
-    tst_performance
+    tst_performance \
+    tst_ubuntu_shape