8dd8acf8bb
Currently a file with a .9.png extension will only have its @2x variant found if it follows this format: foo.9@2x.png Since ".9" should be considered part of the file suffix, it should ideally be able to look like this and still be picked up: foo@2x.9.png This patch makes qt_findAtNxFile() account for .9.* extensions. This is needed for the image-based style support in Qt Quick Controls 2, which uses 9-patch images. qmlbench benchmark results using benchmarks\auto\creation\quick.image\delegates_image.qml with QT_SCALE_FACTOR=2 show no difference in performance after this patch is applied. [ChangeLog][QtGui] High DPI variants of 9-patch images can now be loaded using the following syntax: "foo@2x.9.png" Change-Id: I6d1384113bef21b4fe85a104ee6b16869c93b077 Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
215 lines
10 KiB
C++
215 lines
10 KiB
C++
/****************************************************************************
|
|
**
|
|
** Copyright (C) 2017 The Qt Company Ltd.
|
|
** Contact: https://www.qt.io/licensing/
|
|
**
|
|
** This file is part of the test suite of the Qt Toolkit.
|
|
**
|
|
** $QT_BEGIN_LICENSE:GPL-EXCEPT$
|
|
** Commercial License Usage
|
|
** Licensees holding valid commercial Qt licenses may use this file in
|
|
** accordance with the commercial license agreement provided with the
|
|
** Software or, alternatively, in accordance with the terms contained in
|
|
** a written agreement between you and The Qt Company. For licensing terms
|
|
** and conditions see https://www.qt.io/terms-conditions. For further
|
|
** information use the contact form at https://www.qt.io/contact-us.
|
|
**
|
|
** GNU General Public License Usage
|
|
** Alternatively, this file may be used under the terms of the GNU
|
|
** General Public License version 3 as published by the Free Software
|
|
** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
|
|
** included in the packaging of this file. Please review the following
|
|
** information to ensure the GNU General Public License requirements will
|
|
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
|
|
**
|
|
** $QT_END_LICENSE$
|
|
**
|
|
****************************************************************************/
|
|
|
|
#include <QtTest/QtTest>
|
|
#include <qicon.h>
|
|
|
|
class tst_QIconHighDpi : public QObject
|
|
{
|
|
Q_OBJECT
|
|
public:
|
|
tst_QIconHighDpi();
|
|
|
|
private slots:
|
|
void initTestCase();
|
|
void fromTheme_data();
|
|
void fromTheme();
|
|
void ninePatch();
|
|
};
|
|
|
|
tst_QIconHighDpi::tst_QIconHighDpi()
|
|
{
|
|
}
|
|
|
|
void tst_QIconHighDpi::initTestCase()
|
|
{
|
|
}
|
|
|
|
void tst_QIconHighDpi::fromTheme_data()
|
|
{
|
|
QTest::addColumn<int>("requestedSize");
|
|
QTest::addColumn<int>("expectedSize");
|
|
QTest::addColumn<qreal>("expectedDpr");
|
|
|
|
// The pixmaps that we have available can be found in tst_qiconhighdpi.qrc.
|
|
// Currently we only have @1 and @2 icons available.
|
|
const int dpr = qCeil(qApp->devicePixelRatio());
|
|
|
|
// We have an @2 high DPI version of the 22x22 size of this icon.
|
|
switch (dpr) {
|
|
case 1: QTest::newRow("22x22,dpr=1") << 22 << 22 << 1.0; break;
|
|
case 2: QTest::newRow("22x22,dpr=2") << 22 << 44 << 2.0; break;
|
|
case 3: QTest::newRow("22x22,dpr=3") << 22 << 44 << 2.0; break;
|
|
}
|
|
|
|
// We don't have a high DPI version of the 16x16 size of this icon,
|
|
// so directoryMatchesSize() will return false for all directories.
|
|
// directorySizeDistance() is then called to find the best match.
|
|
// The table below illustrates the results for our available images at various DPRs:
|
|
// Available size | Available scale | Requested size | Requested scale | Distance
|
|
// 22 * 2 - 16 * 1 = 28
|
|
// 22 * 1 - 16 * 1 = 6
|
|
// 16 * 1 - 16 * 1 = 0 < (16x16)
|
|
// Available size | Available scale | Requested size | Requested scale | Distance
|
|
// 22 * 2 - 16 * 2 = 12
|
|
// 22 * 1 - 16 * 2 = 10 < (22x22)
|
|
// 16 * 1 - 16 * 2 = 16
|
|
// Available size | Available scale | Requested size | Requested scale | Distance
|
|
// 22 * 2 - 16 * 3 = 4 < (22x22@2)
|
|
// 22 * 1 - 16 * 3 = 26
|
|
// 16 * 1 - 16 * 3 = 32
|
|
// Both of these functions are implementations of the freedesktop icon theme spec,
|
|
// which dictates that if there is no matching scale, directorySizeDistance() determines
|
|
// the winner, regardless of whether or not the scale is too low for the requested scale.
|
|
switch (dpr) {
|
|
case 1: QTest::newRow("16x16,dpr=1") << 16 << 16 << 1.0; break;
|
|
// PixmapEntry::pixmap() will only downscale the pixmap if actualSize.width() > size.width().
|
|
// In this case, 22 > 32 is false, so a 22x22 pixmap is returned.
|
|
case 2: QTest::newRow("16x16,dpr=2") << 16 << 22 << 1.375; break;
|
|
case 3: QTest::newRow("16x16,dpr=3") << 16 << 44 << 2.75; break;
|
|
}
|
|
|
|
// We don't have an 8x8 size of this icon, so:
|
|
// Available size | Available scale | Requested size | Requested scale | Distance
|
|
// 22 * 2 - 8 * 1 = 36
|
|
// 22 * 1 - 8 * 1 = 14
|
|
// 16 * 1 - 8 * 1 = 8 < (16x16)
|
|
// Available size | Available scale | Requested size | Requested scale | Distance
|
|
// 22 * 2 - 8 * 2 = 28
|
|
// 22 * 1 - 8 * 2 = 6
|
|
// 16 * 1 - 8 * 2 = 0 < (16x16)
|
|
// Available size | Available scale | Requested size | Requested scale | Distance
|
|
// 22 * 2 - 8 * 3 = 20
|
|
// 22 * 1 - 8 * 3 = 2 < (22x22)
|
|
// 16 * 1 - 8 * 3 = 8
|
|
switch (dpr) {
|
|
case 1: QTest::newRow("8x8,dpr=1") << 8 << 8 << 1.0; break;
|
|
case 2: QTest::newRow("8x8,dpr=2") << 8 << 16 << 2.0; break;
|
|
case 3: QTest::newRow("8x8,dpr=3") << 8 << 22 << 2.75; break;
|
|
}
|
|
|
|
// We don't have a 44x44 size of this icon, so:
|
|
// Available size | Available scale | Requested size | Requested scale | Distance
|
|
// 22 * 2 - 44 * 1 = 0 < (22x22@2)
|
|
// 22 * 1 - 44 * 1 = 22
|
|
// 16 * 1 - 44 * 1 = 28
|
|
// Available size | Available scale | Requested size | Requested scale | Distance
|
|
// 22 * 2 - 44 * 2 = 44 < (22x22@2)
|
|
// 22 * 1 - 44 * 2 = 66
|
|
// 16 * 1 - 44 * 2 = 72
|
|
// Available size | Available scale | Requested size | Requested scale | Distance
|
|
// 22 * 2 - 44 * 3 = 88 < (22x22@2)
|
|
// 22 * 1 - 44 * 3 = 110
|
|
// 16 * 1 - 44 * 3 = 116
|
|
switch (dpr) {
|
|
case 1: QTest::newRow("44x44,dpr=1") << 44 << 44 << 1.0; break;
|
|
case 2: QTest::newRow("44x44,dpr=2") << 44 << 44 << 1.0; break;
|
|
case 3: QTest::newRow("44x44,dpr=3") << 44 << 44 << 1.0; break;
|
|
}
|
|
|
|
// We don't have a 20x20 size of this icon, so:
|
|
// Available size | Available scale | Requested size | Requested scale | Distance
|
|
// 22 * 2 - 20 * 1 = 24
|
|
// 22 * 1 - 20 * 1 = 2 < (22x22)
|
|
// 16 * 1 - 20 * 1 = 4
|
|
// Available size | Available scale | Requested size | Requested scale | Distance
|
|
// 22 * 2 - 20 * 2 = 4 < (22x22@2)
|
|
// 22 * 1 - 20 * 2 = 18
|
|
// 16 * 1 - 20 * 2 = 24
|
|
// Available size | Available scale | Requested size | Requested scale | Distance
|
|
// 22 * 2 - 20 * 3 = 16 < (22x22@2)
|
|
// 22 * 1 - 20 * 3 = 38
|
|
// 16 * 1 - 20 * 3 = 44
|
|
switch (dpr) {
|
|
case 1: QTest::newRow("20x20,dpr=1") << 20 << 20 << 1.0; break;
|
|
// PixmapEntry::pixmap() will only downscale the pixmap if actualSize.width() > size.width().
|
|
// In this case, 44 > 40 is true, so the 44x44 pixmap is downscaled to 40x40.
|
|
case 2: QTest::newRow("20x20,dpr=2") << 20 << 40 << 2.0; break;
|
|
case 3: QTest::newRow("20x20,dpr=3") << 20 << 44 << 2.2; break;
|
|
}
|
|
}
|
|
|
|
void tst_QIconHighDpi::fromTheme()
|
|
{
|
|
QFETCH(int, requestedSize);
|
|
QFETCH(int, expectedSize);
|
|
QFETCH(qreal, expectedDpr);
|
|
|
|
QString searchPath = QLatin1String(":/icons");
|
|
QIcon::setThemeSearchPaths(QStringList() << searchPath);
|
|
QCOMPARE(QIcon::themeSearchPaths().size(), 1);
|
|
QCOMPARE(searchPath, QIcon::themeSearchPaths()[0]);
|
|
|
|
QString themeName("testtheme");
|
|
QIcon::setThemeName(themeName);
|
|
QCOMPARE(QIcon::themeName(), themeName);
|
|
|
|
QIcon appointmentIcon = QIcon::fromTheme("appointment-new");
|
|
QVERIFY(!appointmentIcon.isNull());
|
|
QVERIFY(!appointmentIcon.availableSizes(QIcon::Normal, QIcon::Off).isEmpty());
|
|
QVERIFY(appointmentIcon.availableSizes().contains(QSize(16, 16)));
|
|
QVERIFY(appointmentIcon.availableSizes().contains(QSize(22, 22)));
|
|
|
|
const QPixmap pixmap = appointmentIcon.pixmap(requestedSize);
|
|
QCOMPARE(pixmap.size(), QSize(expectedSize, expectedSize));
|
|
// We should get the high DPI version of an image if it exists in the correct directory.
|
|
// Note that we didn't pass the QWindow to QIcon::pixmap(),
|
|
// because QGuiApplication::devicePixelRatio() will be used if no window was given.
|
|
QCOMPARE(pixmap.devicePixelRatio(), expectedDpr);
|
|
}
|
|
|
|
void tst_QIconHighDpi::ninePatch()
|
|
{
|
|
const QIcon icon(":/icons/misc/button.9.png");
|
|
const int dpr = qCeil(qApp->devicePixelRatio());
|
|
|
|
switch (dpr) {
|
|
case 1:
|
|
QCOMPARE(icon.availableSizes().size(), 1);
|
|
QCOMPARE(icon.availableSizes().at(0), QSize(42, 42));
|
|
break;
|
|
case 2:
|
|
QCOMPARE(icon.availableSizes().size(), 2);
|
|
QCOMPARE(icon.availableSizes().at(0), QSize(42, 42));
|
|
QCOMPARE(icon.availableSizes().at(1), QSize(82, 82));
|
|
break;
|
|
}
|
|
}
|
|
|
|
int main(int argc, char *argv[])
|
|
{
|
|
QGuiApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
|
|
QGuiApplication app(argc, argv);
|
|
Q_UNUSED(app);
|
|
tst_QIconHighDpi test;
|
|
QTEST_SET_MAIN_SOURCE_PATH
|
|
return QTest::qExec(&test, argc, argv);
|
|
}
|
|
|
|
#include "tst_qiconhighdpi.moc"
|