Ubuntu UI Toolkit

Merge lp:~fboucault/ubuntu-ui-toolkit/dpr_rebase_qt_5.1 into lp:ubuntu-ui-toolkit

dpr_rebase_qt_5.1
Merge into trunk

Proposed by Florian Boucault on 2013-09-03

Status:

Rejected

Rejected by:

Tim Peeters on 2014-07-15

Proposed branch:

lp:~fboucault/ubuntu-ui-toolkit/dpr_rebase_qt_5.1

Merge into:

lp:ubuntu-ui-toolkit

Diff against target:

525 lines (+219/-61)

11 files modified

modules/Ubuntu/Components/Themes/Ambiance/HeaderStyle.qml (+1/-0)
modules/Ubuntu/Components/Themes/Ambiance/TabBarStyle.qml (+2/-2)
modules/Ubuntu/Components/plugin/shapeitem.cpp (+20/-5)
modules/Ubuntu/Components/plugin/ucqquickimageextension.cpp (+42/-4)
modules/Ubuntu/Components/plugin/ucscalingimageprovider.cpp (+6/-0)
modules/Ubuntu/Components/plugin/ucunits.cpp (+30/-7)
modules/Ubuntu/Components/plugin/ucunits.h (+4/-0)
modules/Ubuntu/Components/plugin/unitythemeiconprovider.cpp (+5/-2)
tests/unit/tst_qquick_image_extension/tst_qquick_image_extension.cpp (+7/-1)
tests/unit/tst_scaling_image_provider/tst_scaling_image_provider.cpp (+12/-4)
tests/unit/tst_units/tst_units.cpp (+90/-36)

To merge this branch:

bzr merge lp:~fboucault/ubuntu-ui-toolkit/dpr_rebase_qt_5.1

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Tim Peeters			Resubmit on 2014-07-15
PS Jenkins bot	continuous-integration		Approve on 2014-03-10
Zsombor Egri		2013-09-03	Pending
Review via email: mp+183762@code.launchpad.net

Commit message

Change is only enabled for the webbrowser app.

Rebase resolution independence on Qt's infrastructure:
- QPlatformScreen::devicePixelRatio
- QPlatformWindow::devicePixelRatio

Change is only enabled for Qt version >= 5.1 and when qtubuntu is in use.
A 'dp' is now exactly one Qt pixel and a 'gu' is 8 Qt pixels.
devicePixelRatio is set to be GRID_UNIT_PX / 8.

Dmitry Shachnev (mitya57) wrote on 2013-09-11:

The tests currently fail here:

FAIL! : qmltestrunner::UCUnitsAPI::test_gu() can use units.gu
   Actual (): 8
   Expected (): 9
   Loc: [/home/dmitry/tests/ubuntu-ui-toolkit/tests/unit/tst_components/tst_plugin_ucunits.qml(40)]

Albert Astals Cid (aacid) wrote on 2013-11-22:

Version with ifdefs at https://code.launchpad.net/~aacid/ubuntu-ui-toolkit/dpr_rebase_qt_5.1_with_ifdefs/+merge/196253

PS Jenkins bot (ps-jenkins) wrote on 2014-02-07:

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

review: Approve (continuous-integration)

lp:~fboucault/ubuntu-ui-toolkit/dpr_rebase_qt_5.1 updated on 2014-02-28

751. By Florian Boucault on 2014-02-28: Merged from trunk.
752. By Florian Boucault on 2014-02-28: Removed duplicated constant.

PS Jenkins bot (ps-jenkins) wrote on 2014-02-28:

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

review: Approve (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2014-02-28:

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

review: Approve (continuous-integration)

lp:~fboucault/ubuntu-ui-toolkit/dpr_rebase_qt_5.1 updated on 2014-03-03

753. By Florian Boucault on 2014-03-03: Removed useless include.

PS Jenkins bot (ps-jenkins) wrote on 2014-03-03:

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

review: Approve (continuous-integration)

lp:~fboucault/ubuntu-ui-toolkit/dpr_rebase_qt_5.1 updated on 2014-03-03

754. By Florian Boucault on 2014-03-03: Do not avoid upscaling.

PS Jenkins bot (ps-jenkins) wrote on 2014-03-03:

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

review: Approve (continuous-integration)

lp:~fboucault/ubuntu-ui-toolkit/dpr_rebase_qt_5.1 updated on 2014-03-03

755. By Florian Boucault on 2014-03-03: Icon image provider: convert from device independent pixels to real pixels
756. By Florian Boucault on 2014-03-03: Fix BorderImage scaling with a workaround.

PS Jenkins bot (ps-jenkins) wrote on 2014-03-03:

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

review: Approve (continuous-integration)

lp:~fboucault/ubuntu-ui-toolkit/dpr_rebase_qt_5.1 updated on 2014-03-03

757. By Florian Boucault on 2014-03-03: Merged from trunk.
758. By Florian Boucault on 2014-03-03: Only activate new code path when Qt is at least version 5.1 and we are using qtubuntu.
759. By Florian Boucault on 2014-03-03: Removed stray debug.

PS Jenkins bot (ps-jenkins) wrote on 2014-03-03:

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

review: Approve (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2014-03-03:

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

review: Approve (continuous-integration)

lp:~fboucault/ubuntu-ui-toolkit/dpr_rebase_qt_5.1 updated on 2014-03-05

760. By Florian Boucault on 2014-03-05: Merged from trunk

PS Jenkins bot (ps-jenkins) wrote on 2014-03-05:

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

review: Approve (continuous-integration)

lp:~fboucault/ubuntu-ui-toolkit/dpr_rebase_qt_5.1 updated on 2014-03-06

761. By Florian Boucault on 2014-03-06: Also activate useDevicePixelRatio for MIR's qtubuntu.

PS Jenkins bot (ps-jenkins) wrote on 2014-03-06:

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

review: Approve (continuous-integration)

lp:~fboucault/ubuntu-ui-toolkit/dpr_rebase_qt_5.1 updated on 2014-03-06

762. By Florian Boucault on 2014-03-06: Removed stray debug.

PS Jenkins bot (ps-jenkins) wrote on 2014-03-06:

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

review: Approve (continuous-integration)

lp:~fboucault/ubuntu-ui-toolkit/dpr_rebase_qt_5.1 updated on 2014-03-06

763. By Florian Boucault on 2014-03-06: TabBar: do not rely on sourceSize that uses real pixels.

PS Jenkins bot (ps-jenkins) wrote on 2014-03-06:

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

review: Approve (continuous-integration)

Zsombor Egri (zsombi) wrote on 2014-03-07:

25 - height: 0.82*sourceSize.height
26 + height: units.dp(25)

This may cause the chevron issues on Mir, however we need to check whether it appears on SurfaceFlinger. If it does, the image scaling needs to be revisited.

lp:~fboucault/ubuntu-ui-toolkit/dpr_rebase_qt_5.1 updated on 2014-03-07

764. By Florian Boucault on 2014-03-07: Made tab bar chevron a bit smaller and prettier.

PS Jenkins bot (ps-jenkins) wrote on 2014-03-07:

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

review: Approve (continuous-integration)

lp:~fboucault/ubuntu-ui-toolkit/dpr_rebase_qt_5.1 updated on 2014-03-10

765. By Florian Boucault on 2014-03-10: Only activate devicePixelRatio based scaling for webbrowser-app.
766. By Florian Boucault on 2014-03-10: Reverted unwanted change from previous commit.
767. By Florian Boucault on 2014-03-10: Also activate devicePixelRatio based scaling for webapps.

PS Jenkins bot (ps-jenkins) wrote on 2014-03-10:

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

review: Approve (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2014-03-10:

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

review: Approve (continuous-integration)

Tim Peeters (tpeeters) wrote on 2014-07-15:

If this MR is still valid, please resubmit it to staging

review: Resubmit

Unmerged revisions

767. By Florian Boucault on 2014-03-10: Also activate devicePixelRatio based scaling for webapps.
766. By Florian Boucault on 2014-03-10: Reverted unwanted change from previous commit.
765. By Florian Boucault on 2014-03-10: Only activate devicePixelRatio based scaling for webbrowser-app.
764. By Florian Boucault on 2014-03-07: Made tab bar chevron a bit smaller and prettier.
763. By Florian Boucault on 2014-03-06: TabBar: do not rely on sourceSize that uses real pixels.
762. By Florian Boucault on 2014-03-06: Removed stray debug.
761. By Florian Boucault on 2014-03-06: Also activate useDevicePixelRatio for MIR's qtubuntu.
760. By Florian Boucault on 2014-03-05: Merged from trunk
759. By Florian Boucault on 2014-03-03: Removed stray debug.
758. By Florian Boucault on 2014-03-03: Only activate new code path when Qt is at least version 5.1 and we are using qtubuntu.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Brian Blevins

Caco V. Topia

Dmitry Shachnev

Florian Boucault

Jaroslavas Karmazinas

Ubuntu SDK team

to status/vote changes:

william

 === modified file 'modules/Ubuntu/Components/Themes/Ambiance/HeaderStyle.qml'
 --- modules/Ubuntu/Components/Themes/Ambiance/HeaderStyle.qml	2014-01-08 16:32:38 +0000
 +++ modules/Ubuntu/Components/Themes/Ambiance/HeaderStyle.qml	2014-03-10 17:18:58 +0000
@@ -50,6 +50,7 @@
              left: parent.left
              right: parent.right
+         }
++        height: units.dp(15)
          source: headerStyle.separatorSource
+     }
      Image {
 === modified file 'modules/Ubuntu/Components/Themes/Ambiance/TabBarStyle.qml'
 --- modules/Ubuntu/Components/Themes/Ambiance/TabBarStyle.qml	2014-02-26 18:29:40 +0000
 +++ modules/Ubuntu/Components/Themes/Ambiance/TabBarStyle.qml	2014-03-10 17:18:58 +0000
@@ -162,11 +162,11 @@
                          source: indicatorImageSource
                          anchors {
                              bottom: parent.bottom
--                            bottomMargin: headerTextBottomMargin
++                            bottomMargin: headerTextBottomMargin - units.dp(3)
+                         }
                          x: button.width - width
                          // FIXME: temporary hack for the chevron's height to match the font size
--                        height: 0.82*sourceSize.height
++                        height: units.dp(20)
                          // The indicator image must be visible after the selected tab button, when the
                          // tab bar is not in selection mode, or after the "last" button (starting with
 === modified file 'modules/Ubuntu/Components/plugin/shapeitem.cpp'
 --- modules/Ubuntu/Components/plugin/shapeitem.cpp	2013-11-22 19:21:34 +0000
 +++ modules/Ubuntu/Components/plugin/shapeitem.cpp	2014-03-10 17:18:58 +0000
@@ -146,8 +146,13 @@
      setFlag(ItemHasContents);
      QObject::connect(&UCUnits::instance(), SIGNAL(gridUnitChanged()), this,
                       SLOT(gridUnitChanged()));
--    setImplicitWidth(8 * gridUnit_);
--    setImplicitHeight(8 * gridUnit_);
++    if (UCUnits::useDevicePixelRatio) {
++        setImplicitWidth(8 * DEFAULT_GRID_UNIT_PX);
++        setImplicitHeight(8 * DEFAULT_GRID_UNIT_PX);
++    } else {
++        setImplicitWidth(8 * gridUnit_);
++        setImplicitHeight(8 * gridUnit_);
++    }
      update();
+ }
@@ -324,8 +329,13 @@
  void ShapeItem::gridUnitChanged()
+ {
      gridUnit_ = UCUnits::instance().gridUnit();
--    setImplicitWidth(8 * gridUnit_);
--    setImplicitHeight(8 * gridUnit_);
++    if (UCUnits::useDevicePixelRatio) {
++        setImplicitWidth(8 * DEFAULT_GRID_UNIT_PX);
++        setImplicitHeight(8 * DEFAULT_GRID_UNIT_PX);
++    } else {
++        setImplicitWidth(8 * gridUnit_);
++        setImplicitHeight(8 * gridUnit_);
++    }
      dirtyFlags_ |= ShapeItem::DirtyGridUnit;
      update();
+ }
@@ -390,7 +400,12 @@
      // is less than 2 radii, the radius is scaled down anyhow.
      float radius = (radius_ == ShapeItem::SmallRadius) ?
          textureData->smallRadius : textureData->mediumRadius;
--    const float scaleFactor = gridUnit_ / textureData->gridUnit;
++    float scaleFactor;
++    if (UCUnits::useDevicePixelRatio) {
++        scaleFactor = DEFAULT_GRID_UNIT_PX / textureData->gridUnit;
++    } else {
++        scaleFactor = gridUnit_ / textureData->gridUnit;
++    }
      radius *= scaleFactor;
      int scaledDown = 0;
      if (scaleFactor != 1.0f) {
 === modified file 'modules/Ubuntu/Components/plugin/ucqquickimageextension.cpp'
 --- modules/Ubuntu/Components/plugin/ucqquickimageextension.cpp	2013-10-18 08:56:39 +0000
 +++ modules/Ubuntu/Components/plugin/ucqquickimageextension.cpp	2014-03-10 17:18:58 +0000
@@ -75,15 +75,16 @@
      QString scaleFactor = resolved.left(separatorPosition);
      QString selectedFilePath = resolved.mid(separatorPosition+1);
--    if (scaleFactor == "1") {
--        // No scaling. Just pass the file as is.
--        m_image->setSource(QUrl::fromLocalFile(selectedFilePath));
--    } else {
++    if (UCUnits::useDevicePixelRatio) {
          // Prepend "image://scaling" for the image to be loaded by UCScalingImageProvider.
          if (!m_source.path().endsWith(".sci")) {
              // Regular image file
              m_image->setSource(QUrl("image://scaling/" + resolved));
          } else {
++            /* FIXME: workaround for https://bugreports.qt-project.org/browse/QTBUG-37206 */
++            float windowPixelRatio = UCUnits::instance().gridUnit() / DEFAULT_GRID_UNIT_PX;
++            scaleFactor = QString::number(scaleFactor.toFloat() / windowPixelRatio);
++
              // .sci image file. Rewrite the .sci file into a temporary file.
              bool rewritten = true;
              QTemporaryFile* rewrittenSciFile;
@@ -110,6 +111,43 @@
                  m_image->setSource(m_source);
+             }
+         }
++    } else {
++        if (scaleFactor == "1") {
++            // No scaling. Just pass the file as is.
++            m_image->setSource(QUrl::fromLocalFile(selectedFilePath));
++        } else {
++            // Prepend "image://scaling" for the image to be loaded by UCScalingImageProvider.
++            if (!m_source.path().endsWith(".sci")) {
++                // Regular image file
++                m_image->setSource(QUrl("image://scaling/" + resolved));
++            } else {
++                // .sci image file. Rewrite the .sci file into a temporary file.
++                bool rewritten = true;
++                QTemporaryFile* rewrittenSciFile;
++
++                /* Ensure that only one temporary rewritten .sci file is created
++                   for each source .sci file by storing the path to the temporary
++                   file in a global hash.
++                */
++                rewrittenSciFile = UCQQuickImageExtension::s_rewrittenSciFiles.value(m_source).data();
++                if (rewrittenSciFile == NULL) {
++                    rewrittenSciFile = new QTemporaryFile;
++                    rewrittenSciFile->setFileTemplate(QDir::tempPath() + QDir::separator() + "XXXXXX.sci");
++                    rewrittenSciFile->open();
++                    QTextStream output(rewrittenSciFile);
++                    rewritten = rewriteSciFile(selectedFilePath, scaleFactor, output);
++                    rewrittenSciFile->close();
++
++                    s_rewrittenSciFiles.insert(m_source, QSharedPointer<QTemporaryFile>(rewrittenSciFile));
++                }
++
++                if (rewritten) {
++                    m_image->setSource(QUrl::fromLocalFile(rewrittenSciFile->fileName()));
++                } else {
++                    m_image->setSource(m_source);
++                }
++            }
++        }
+     }
+ }
 === modified file 'modules/Ubuntu/Components/plugin/ucscalingimageprovider.cpp'
 --- modules/Ubuntu/Components/plugin/ucscalingimageprovider.cpp	2013-04-20 01:14:43 +0000
 +++ modules/Ubuntu/Components/plugin/ucscalingimageprovider.cpp	2014-03-10 17:18:58 +0000
@@ -17,6 +17,7 @@
   */
  #include "ucscalingimageprovider.h"
++#include "ucunits.h"
  #include <QtCore/QFile>
  #include <QtGui/QImageReader>
@@ -65,6 +66,11 @@
          imageReader.read(&image);
          *size = scaledSize;
++
++        if (UCUnits::useDevicePixelRatio) {
++            float windowPixelRatio = UCUnits::instance().gridUnit() / DEFAULT_GRID_UNIT_PX;
++            image.setDevicePixelRatio(windowPixelRatio);
++        }
          return image;
      } else {
          return QImage();
 === modified file 'modules/Ubuntu/Components/plugin/ucunits.cpp'
 --- modules/Ubuntu/Components/plugin/ucunits.cpp	2013-10-18 08:56:39 +0000
 +++ modules/Ubuntu/Components/plugin/ucunits.cpp	2014-03-10 17:18:58 +0000
@@ -24,9 +24,11 @@
  #include <QtCore/QDir>
  #include <QtCore/QRegularExpression>
  #include <QtCore/qmath.h>
++#include <QtCore/QDebug>
++#include <QtGui/QGuiApplication>
++#include <QtCore/QCoreApplication>
  #define ENV_GRID_UNIT_PX "GRID_UNIT_PX"
--#define DEFAULT_GRID_UNIT_PX 8
  static float getenvFloat(const char* name, float defaultValue)
+ {
@@ -36,6 +38,12 @@
      return ok ? value : defaultValue;
+ }
++bool UCUnits::useDevicePixelRatio = (QT_VERSION >= QT_VERSION_CHECK(5, 1, 0)) &&
++                                     (QGuiApplication::platformName() == "ubuntu" ||
++                                      QGuiApplication::platformName() == "ubuntumirserver" ||
++                                      QGuiApplication::platformName() == "ubuntumirclient") &&
++                                     (QCoreApplication::applicationName() == "webbrowser-app" ||
++                                      QCoreApplication::applicationName() == "webapp-container");
  /*!
      \qmltype Units
@@ -80,6 +88,13 @@
  void UCUnits::setGridUnit(float gridUnit)
+ {
++    /* Implementation of resolution independence is spread accross
++       the toolkit and qtubuntu. The number of pixels for a grid unit
++       is read by both from the environment variable GRID_UNIT_PX.
++       Setting the 'gridUnit' property here has no effect.
++    */
++    qWarning() << "UCUnits::setGridUnit is deprecated.";
++
      m_gridUnit = gridUnit;
      Q_EMIT gridUnitChanged();
+ }
@@ -91,12 +106,16 @@
  */
  float UCUnits::dp(float value)
+ {
--    const float ratio = m_gridUnit / DEFAULT_GRID_UNIT_PX;
--    if (value <= 2.0) {
--        // for values under 2dp, return only multiples of the value
--        return qRound(value * qFloor(ratio));
++    if (UCUnits::useDevicePixelRatio) {
++        return qRound(value);
      } else {
--        return qRound(value * ratio);
++        const float ratio = m_gridUnit / DEFAULT_GRID_UNIT_PX;
++        if (value <= 2.0) {
++            // for values under 2dp, return only multiples of the value
++            return qRound(value * qFloor(ratio));
++        } else {
++            return qRound(value * ratio);
++        }
+     }
+ }
@@ -107,7 +126,11 @@
  */
  float UCUnits::gu(float value)
+ {
--    return qRound(value * m_gridUnit);
++    if (UCUnits::useDevicePixelRatio) {
++        return qRound(value * DEFAULT_GRID_UNIT_PX);
++    } else {
++        return qRound(value * m_gridUnit);
++    }
+ }
  QString UCUnits::resolveResource(const QUrl& url)
 === modified file 'modules/Ubuntu/Components/plugin/ucunits.h'
 --- modules/Ubuntu/Components/plugin/ucunits.h	2013-10-18 08:56:39 +0000
 +++ modules/Ubuntu/Components/plugin/ucunits.h	2014-03-10 17:18:58 +0000
@@ -23,6 +23,8 @@
  #include <QtCore/QHash>
  #include <QtCore/QUrl>
++#define DEFAULT_GRID_UNIT_PX 8
++
  class UCUnits : public QObject
+ {
      Q_OBJECT
@@ -45,6 +47,8 @@
      // setters
      void setGridUnit(float gridUnit);
++    static bool useDevicePixelRatio;
++
  Q_SIGNALS:
      void gridUnitChanged();
 === modified file 'modules/Ubuntu/Components/plugin/unitythemeiconprovider.cpp'
 --- modules/Ubuntu/Components/plugin/unitythemeiconprovider.cpp	2014-02-24 18:20:43 +0000
 +++ modules/Ubuntu/Components/plugin/unitythemeiconprovider.cpp	2014-03-10 17:18:58 +0000
@@ -17,6 +17,7 @@
   */
  #include "unitythemeiconprovider.h"
++#include "ucunits.h"
  #include <QIcon>
@@ -34,8 +35,10 @@
          icon = QIcon::fromTheme(name);
          if (!icon.isNull()) {
              if (requestedSize.isValid()) {
--                *realSize =requestedSize;
--                return icon.pixmap(requestedSize);
++                /* Convert from device independent pixels to pixels into actual pixels */
++                float windowPixelRatio = UCUnits::instance().gridUnit() / DEFAULT_GRID_UNIT_PX;
++                *realSize = requestedSize * windowPixelRatio;
++                return icon.pixmap(*realSize);
              } else {
                  QList<QSize> sizes = icon.availableSizes();
                  if (sizes.count() > 0 && sizes.last().isValid()) {
 === modified file 'tests/unit/tst_qquick_image_extension/tst_qquick_image_extension.cpp'
 --- tests/unit/tst_qquick_image_extension/tst_qquick_image_extension.cpp	2013-05-06 16:33:54 +0000
 +++ tests/unit/tst_qquick_image_extension/tst_qquick_image_extension.cpp	2014-03-10 17:18:58 +0000
@@ -18,6 +18,7 @@
  #include <QtTest/QtTest>
  #include <QtQuick/private/qquickimagebase_p.h>
++#include "ucunits.h"
  // Make protected methods of QQuickImageExtension public in order to test them
  #define protected public
@@ -55,7 +56,12 @@
      void scaledBorderDouble() {
          UCQQuickImageExtension image;
          QString border = "border: 13";
--        QString expected = "border: 26";
++        QString expected;
++        if (UCUnits::useDevicePixelRatio) {
++            expected = "border: 13";
++        } else {
++            expected = "border: 26";
++        }
          QString result = image.scaledBorder(border, "2");
          QCOMPARE(result, expected);
+     }
 === modified file 'tests/unit/tst_scaling_image_provider/tst_scaling_image_provider.cpp'
 --- tests/unit/tst_scaling_image_provider/tst_scaling_image_provider.cpp	2013-04-20 00:39:40 +0000
 +++ tests/unit/tst_scaling_image_provider/tst_scaling_image_provider.cpp	2014-03-10 17:18:58 +0000
@@ -18,6 +18,7 @@
  #include <QtTest/QtTest>
  #include "ucscalingimageprovider.h"
++#include "ucunits.h"
  class tst_UCScalingImageProvider: public QObject
+ {
@@ -67,10 +68,17 @@
          QTest::newRow("downscaling, smaller width")          << inputFile << "0.5" << QSize(50, 1000) << QSize(64, 128) << QSize(50, 100);
          QTest::newRow("downscaling, smaller height")         << inputFile << "0.5" << QSize(1000, 50) << QSize(64, 128) << QSize(25, 50);
          QTest::newRow("downscaling, smaller width and height")<< inputFile << "0.5" << QSize(50, 50) << QSize(64, 128) << QSize(25, 50);
--        QTest::newRow("upscaling, bigger width and height")  << inputFile << "2.0" << QSize(1000, 1000) << QSize(256, 512) << QSize(256, 512);
--        QTest::newRow("upscaling, smaller width")            << inputFile << "2.0" << QSize(50, 1000) << QSize(256, 512) << QSize(50, 100);
--        QTest::newRow("upscaling, smaller height")           << inputFile << "2.0" << QSize(1000, 50) << QSize(256, 512) << QSize(25, 50);
--        QTest::newRow("upscaling, smaller width and height") << inputFile << "2.0" << QSize(50, 50) << QSize(256, 512) << QSize(25, 50);
++        if (UCUnits::useDevicePixelRatio) {
++            QTest::newRow("upscaling, bigger width and height")  << inputFile << "2.0" << QSize(1000, 1000) << QSize(128, 256) << QSize(128, 256);
++            QTest::newRow("upscaling, smaller width")            << inputFile << "2.0" << QSize(50, 1000) << QSize(128, 256) << QSize(50, 100);
++            QTest::newRow("upscaling, smaller height")           << inputFile << "2.0" << QSize(1000, 50) << QSize(128, 256) << QSize(25, 50);
++            QTest::newRow("upscaling, smaller width and height") << inputFile << "2.0" << QSize(50, 50) << QSize(128, 256) << QSize(25, 50);
++        } else {
++            QTest::newRow("upscaling, bigger width and height") << inputFile << "2.0" << QSize(1000, 1000) << QSize(256, 512) << QSize(256, 512);
++            QTest::newRow("upscaling, smaller width") << inputFile << "2.0" << QSize(50, 1000) << QSize(256, 512) << QSize(50, 100);
++            QTest::newRow("upscaling, smaller height") << inputFile << "2.0" << QSize(1000, 50) << QSize(256, 512) << QSize(25, 50);
++            QTest::newRow("upscaling, smaller width and height") << inputFile << "2.0" << QSize(50, 50) << QSize(256, 512) << QSize(25, 50);
++        }
+     }
      void respectRequestedSize() {
 === modified file 'tests/unit/tst_units/tst_units.cpp'
 --- tests/unit/tst_units/tst_units.cpp	2013-02-05 17:10:20 +0000
 +++ tests/unit/tst_units/tst_units.cpp	2014-03-10 17:18:58 +0000
@@ -85,72 +85,126 @@
          QCOMPARE(units.dp(0.23), 0.0f);
          QCOMPARE(units.dp(0.51), 1.0f);
          QCOMPARE(units.dp(0.9999), 1.0f);
--        QCOMPARE(units.dp(1000.01), 1250.0f);
++        if (UCUnits::useDevicePixelRatio) {
++            QCOMPARE(units.dp(1000.01), 1000.0f);
++        } else {
++            QCOMPARE(units.dp(1000.01), 1250.0f);
++        }
+     }
      void guGridUnitTen() {
          UCUnits units;
          units.setGridUnit(10);
--        QCOMPARE(units.gu(0.5), 5.0f);
--        QCOMPARE(units.gu(1), 10.0f);
--        QCOMPARE(units.gu(1.5), 15.0f);
--        QCOMPARE(units.gu(2), 20.0f);
--        QCOMPARE(units.gu(4), 40.0f);
--        QCOMPARE(units.gu(100000), 1000000.0f);
--        QCOMPARE(units.gu(150.51983), 1505.0f);
++        if (UCUnits::useDevicePixelRatio) {
++            QCOMPARE(units.gu(0.5), 4.0f);
++            QCOMPARE(units.gu(1), 8.0f);
++            QCOMPARE(units.gu(1.5), 12.0f);
++            QCOMPARE(units.gu(2), 16.0f);
++            QCOMPARE(units.gu(4), 32.0f);
++            QCOMPARE(units.gu(100000), 800000.0f);
++            QCOMPARE(units.gu(150.51983), 1204.0f);
++        } else {
++            QCOMPARE(units.gu(0.5), 5.0f);
++            QCOMPARE(units.gu(1), 10.0f);
++            QCOMPARE(units.gu(1.5), 15.0f);
++            QCOMPARE(units.gu(2), 20.0f);
++            QCOMPARE(units.gu(4), 40.0f);
++            QCOMPARE(units.gu(100000), 1000000.0f);
++            QCOMPARE(units.gu(150.51983), 1505.0f);
++        }
+     }
      void dpGridUnitSixteen() {
          UCUnits units;
          units.setGridUnit(16);
--        QCOMPARE(units.dp(1.0), 2.0f);
--        QCOMPARE(units.dp(1.32), 3.0f);
--        QCOMPARE(units.dp(1.72), 3.0f);
--        QCOMPARE(units.dp(0.23), 0.0f);
--        QCOMPARE(units.dp(0.51), 1.0f);
--        QCOMPARE(units.dp(0.9999), 2.0f);
--        QCOMPARE(units.dp(1000.01), 2000.0f);
++        if (UCUnits::useDevicePixelRatio) {
++            QCOMPARE(units.dp(1.0), 1.0f);
++            QCOMPARE(units.dp(1.32), 1.0f);
++            QCOMPARE(units.dp(1.72), 2.0f);
++            QCOMPARE(units.dp(0.23), 0.0f);
++            QCOMPARE(units.dp(0.51), 1.0f);
++            QCOMPARE(units.dp(0.9999), 1.0f);
++            QCOMPARE(units.dp(1000.01), 1000.0f);
++        } else {
++            QCOMPARE(units.dp(1.0), 2.0f);
++            QCOMPARE(units.dp(1.32), 3.0f);
++            QCOMPARE(units.dp(1.72), 3.0f);
++            QCOMPARE(units.dp(0.23), 0.0f);
++            QCOMPARE(units.dp(0.51), 1.0f);
++            QCOMPARE(units.dp(0.9999), 2.0f);
++            QCOMPARE(units.dp(1000.01), 2000.0f);
++        }
+     }
      void guGridUnitSixteen() {
          UCUnits units;
          units.setGridUnit(16);
--        QCOMPARE(units.gu(0.5), 8.0f);
--        QCOMPARE(units.gu(1), 16.0f);
--        QCOMPARE(units.gu(1.5), 24.0f);
--        QCOMPARE(units.gu(2), 32.0f);
--        QCOMPARE(units.gu(4), 64.0f);
--        QCOMPARE(units.gu(100000), 1600000.0f);
--        QCOMPARE(units.gu(150.51983), 2408.0f);
++        if (UCUnits::useDevicePixelRatio) {
++            QCOMPARE(units.gu(0.5), 4.0f);
++            QCOMPARE(units.gu(1), 8.0f);
++            QCOMPARE(units.gu(1.5), 12.0f);
++            QCOMPARE(units.gu(2), 16.0f);
++            QCOMPARE(units.gu(4), 32.0f);
++            QCOMPARE(units.gu(100000), 800000.0f);
++            QCOMPARE(units.gu(150.51983), 1204.0f);
++        } else {
++            QCOMPARE(units.gu(0.5), 8.0f);
++            QCOMPARE(units.gu(1), 16.0f);
++            QCOMPARE(units.gu(1.5), 24.0f);
++            QCOMPARE(units.gu(2), 32.0f);
++            QCOMPARE(units.gu(4), 64.0f);
++            QCOMPARE(units.gu(100000), 1600000.0f);
++            QCOMPARE(units.gu(150.51983), 2408.0f);
++        }
+     }
      void dpGridUnitEighteen() {
          UCUnits units;
          units.setGridUnit(18);
--        QCOMPARE(units.dp(1.0), 2.0f);
--        QCOMPARE(units.dp(1.32), 3.0f);
--        QCOMPARE(units.dp(1.72), 3.0f);
--        QCOMPARE(units.dp(0.23), 0.0f);
--        QCOMPARE(units.dp(0.51), 1.0f);
--        QCOMPARE(units.dp(0.9999), 2.0f);
--        QCOMPARE(units.dp(1000.01), 2250.0f);
++        if (UCUnits::useDevicePixelRatio) {
++            QCOMPARE(units.dp(1.0), 1.0f);
++            QCOMPARE(units.dp(1.32), 1.0f);
++            QCOMPARE(units.dp(1.72), 2.0f);
++            QCOMPARE(units.dp(0.23), 0.0f);
++            QCOMPARE(units.dp(0.51), 1.0f);
++            QCOMPARE(units.dp(0.9999), 1.0f);
++            QCOMPARE(units.dp(1000.01), 1000.0f);
++        } else {
++            QCOMPARE(units.dp(1.0), 2.0f);
++            QCOMPARE(units.dp(1.32), 3.0f);
++            QCOMPARE(units.dp(1.72), 3.0f);
++            QCOMPARE(units.dp(0.23), 0.0f);
++            QCOMPARE(units.dp(0.51), 1.0f);
++            QCOMPARE(units.dp(0.9999), 2.0f);
++            QCOMPARE(units.dp(1000.01), 2250.0f);
++        }
+     }
      void dpGridUnitTwenty() {
          UCUnits units;
          units.setGridUnit(20);
--        QCOMPARE(units.dp(1.0), 2.0f);
--        QCOMPARE(units.dp(1.32), 3.0f);
--        QCOMPARE(units.dp(1.72), 3.0f);
--        QCOMPARE(units.dp(0.23), 0.0f);
--        QCOMPARE(units.dp(0.51), 1.0f);
--        QCOMPARE(units.dp(0.9999), 2.0f);
--        QCOMPARE(units.dp(1000.01), 2500.0f);
++        if (UCUnits::useDevicePixelRatio) {
++            QCOMPARE(units.dp(1.0), 1.0f);
++            QCOMPARE(units.dp(1.32), 1.0f);
++            QCOMPARE(units.dp(1.72), 2.0f);
++            QCOMPARE(units.dp(0.23), 0.0f);
++            QCOMPARE(units.dp(0.51), 1.0f);
++            QCOMPARE(units.dp(0.9999), 1.0f);
++            QCOMPARE(units.dp(1000.01), 1000.0f);
++        } else {
++            QCOMPARE(units.dp(1.0), 2.0f);
++            QCOMPARE(units.dp(1.32), 3.0f);
++            QCOMPARE(units.dp(1.72), 3.0f);
++            QCOMPARE(units.dp(0.23), 0.0f);
++            QCOMPARE(units.dp(0.51), 1.0f);
++            QCOMPARE(units.dp(0.9999), 2.0f);
++            QCOMPARE(units.dp(1000.01), 2500.0f);
++        }
+     }
      void resolveEmpty() {

Ubuntu UI Toolkit

Merge lp:~fboucault/ubuntu-ui-toolkit/dpr_rebase_qt_5.1 into lp:ubuntu-ui-toolkit

Commit message

Description of the change

Unmerged revisions

Preview Diff

Subscribers