diff options
Diffstat (limited to 'tests/auto/gui/image/qiconhighdpi')
-rw-r--r-- | tests/auto/gui/image/qiconhighdpi/CMakeLists.txt | 15 | ||||
-rw-r--r-- | tests/auto/gui/image/qiconhighdpi/qiconhighdpi.pro | 8 | ||||
-rw-r--r-- | tests/auto/gui/image/qiconhighdpi/tst_qiconhighdpi.cpp | 96 |
3 files changed, 78 insertions, 41 deletions
diff --git a/tests/auto/gui/image/qiconhighdpi/CMakeLists.txt b/tests/auto/gui/image/qiconhighdpi/CMakeLists.txt index 8113422c1e..f0ccb97c8a 100644 --- a/tests/auto/gui/image/qiconhighdpi/CMakeLists.txt +++ b/tests/auto/gui/image/qiconhighdpi/CMakeLists.txt @@ -1,19 +1,26 @@ -# Generated from qiconhighdpi.pro. +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause ##################################################################### ## tst_qiconhighdpi Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qiconhighdpi LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + # Collect test data file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} icons/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qiconhighdpi +qt_internal_add_test(tst_qiconhighdpi SOURCES tst_qiconhighdpi.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::Gui TESTDATA ${test_data} ) @@ -28,7 +35,7 @@ set(tst_qiconhighdpi_resource_files "icons/testtheme/index.theme" ) -qt_add_resource(tst_qiconhighdpi "tst_qiconhighdpi" +qt_internal_add_resource(tst_qiconhighdpi "tst_qiconhighdpi" PREFIX "/" FILES diff --git a/tests/auto/gui/image/qiconhighdpi/qiconhighdpi.pro b/tests/auto/gui/image/qiconhighdpi/qiconhighdpi.pro deleted file mode 100644 index 49c615721b..0000000000 --- a/tests/auto/gui/image/qiconhighdpi/qiconhighdpi.pro +++ /dev/null @@ -1,8 +0,0 @@ -CONFIG += testcase -TARGET = tst_qiconhighdpi - -QT += testlib -SOURCES += tst_qiconhighdpi.cpp -RESOURCES = tst_qiconhighdpi.qrc - -TESTDATA += icons/* diff --git a/tests/auto/gui/image/qiconhighdpi/tst_qiconhighdpi.cpp b/tests/auto/gui/image/qiconhighdpi/tst_qiconhighdpi.cpp index 52f38419c7..34f0132865 100644 --- a/tests/auto/gui/image/qiconhighdpi/tst_qiconhighdpi.cpp +++ b/tests/auto/gui/image/qiconhighdpi/tst_qiconhighdpi.cpp @@ -1,32 +1,7 @@ -/**************************************************************************** -** -** 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> +// Copyright (C) 2017 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only + +#include <QTest> #include <qicon.h> class tst_QIconHighDpi : public QObject @@ -39,7 +14,10 @@ private slots: void initTestCase(); void fromTheme_data(); void fromTheme(); + void addPixmap_data(); + void addPixmap(); void ninePatch(); + void preferUpscale(); }; tst_QIconHighDpi::tst_QIconHighDpi() @@ -173,6 +151,49 @@ void tst_QIconHighDpi::fromTheme() QCOMPARE(pixmap.devicePixelRatio(), expectedDpr); } +void tst_QIconHighDpi::addPixmap_data() +{ + // fromTheme() and addPixmap() test the QIconLoaderEngine and QPixmapIconEngine + // QIcon backend, repsectively. We want these to have identical behavior and + // re-use the same test data here. + fromTheme_data(); +} + +void tst_QIconHighDpi::addPixmap() +{ + QFETCH(int, requestedSize); + QFETCH(qreal, requestedDpr); + QFETCH(int, expectedSize); + QFETCH(qreal, expectedDpr); + + QIcon icon; + + // manual pixmap adder for full control of devicePixelRatio + auto addPixmapWithDpr = [&icon](const QString &path, qreal dpr) { + QImage image(path); + image.setDevicePixelRatio(dpr); + icon.addPixmap(QPixmap::fromImage(image)); + }; + + addPixmapWithDpr(":icons/testtheme/16x16/actions/appointment-new.png", 1); + addPixmapWithDpr(":icons/testtheme/22x22/actions/appointment-new.png", 1); + addPixmapWithDpr(":icons/testtheme/22x22@2/actions/appointment-new.png", 2); + + QVERIFY(icon.availableSizes().contains(QSize(16, 16))); + QVERIFY(icon.availableSizes().contains(QSize(22, 22))); + + if (qstrcmp(QTest::currentDataTag(), "16x16,dpr=2") == 0) + QSKIP("broken corner case"); // expect 22x22, get 32x32 + if (qstrcmp(QTest::currentDataTag(), "44x44,dpr=1") == 0) + QSKIP("broken corner case"); // expect 44x44, get 22x22 + if (qstrcmp(QTest::currentDataTag(), "8x8,dpr=3") == 0) + QSKIP("broken corner case");// expect 22x22, get 24x24 + + const QPixmap pixmap = icon.pixmap(QSize(requestedSize, requestedSize), requestedDpr); + QCOMPARE(pixmap.size(), QSize(expectedSize, expectedSize)); + QCOMPARE(pixmap.devicePixelRatio(), expectedDpr); +} + void tst_QIconHighDpi::ninePatch() { const QIcon icon(":/icons/misc/button.9.png"); @@ -191,6 +212,23 @@ void tst_QIconHighDpi::ninePatch() } } +void tst_QIconHighDpi::preferUpscale() +{ + QIcon icon; + + // manual pixmap adder for full control of devicePixelRatio + auto addPixmapWithDpr = [&icon](const QString &path, qreal dpr) { + QImage image(path); + image.setDevicePixelRatio(dpr); + icon.addPixmap(QPixmap::fromImage(image)); + }; + + addPixmapWithDpr(":/icons/testtheme/22x22/actions/appointment-new.png", 1); + addPixmapWithDpr(":/icons/testtheme/22x22@2/actions/appointment-new.png", 2); + + QCOMPARE(icon.pixmap(QSize(22, 22), 1.25f).devicePixelRatio(), 1.25f); +} + int main(int argc, char *argv[]) { QGuiApplication app(argc, argv); |