whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix up existing high DPI manual test. 

Compile on Windows, add command line options to activate the
various tests.

Task-number: QTBUG-38858
Change-Id: I38c6a9a6711831b2bd8b6ea051dd19615cc911a1
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
bb10
Friedemann Kleint 2014-07-18 14:22:14 +02:00
parent f547381806
commit ec190b0da7
2 changed files with 124 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/manual/highdpi/highdpi.pro
View File

@ -2,7 +2,7 @@ TEMPLATE = app
TARGET = highdpi
INCLUDEPATH += .
QT += widgets
CONFIG+=console
# Input
SOURCES += main.cpp

174
tests/manual/highdpi/main.cpp
View File

@ -1,6 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the test suite of the Qt Toolkit.
@ -39,9 +39,27 @@
**
****************************************************************************/
#include <QtCore>
#include <QtGui>
#include <QtWidgets>
#include <QMainWindow>
#include <QLabel>
#include <QHBoxLayout>
#include <QApplication>
#include <QAction>
#include <QStyle>
#include <QToolBar>
#include <QPushButton>
#include <QLineEdit>
#include <QScrollBar>
#include <QSlider>
#include <QSpinBox>
#include <QTabBar>
#include <QIcon>
#include <QPainter>
#include <QWindow>
#include <QScreen>
#include <QFile>
#include <QTemporaryDir>
#include <QCommandLineParser>
#include <QCommandLineOption>
class PixmapPainter : public QWidget
@ -74,7 +92,7 @@ PixmapPainter::PixmapPainter()
qtIcon.addFile(":/qticon32@2x.png");
}
void PixmapPainter::paintEvent(QPaintEvent *event)
void PixmapPainter::paintEvent(QPaintEvent *)
{
QPainter p(this);
p.fillRect(QRect(QPoint(0, 0), size()), QBrush(Qt::gray));
@ -187,7 +205,7 @@ MainWindow::MainWindow()
class StandardIcons : public QWidget
{
public:
void paintEvent(QPaintEvent *event)
void paintEvent(QPaintEvent *)
{
int x = 10;
int y = 10;
@ -203,13 +221,13 @@ public:
y+=dy;
x = ((x + dx) % maxX);
}
};
}
};
class Caching : public QWidget
{
public:
void paintEvent(QPaintEvent *event)
void paintEvent(QPaintEvent *)
{
QSize layoutSize(75, 75);
@ -232,7 +250,7 @@ public:
{
const qreal devicePixelRatio = this->windowHandle()->devicePixelRatio();
QImage cache = QImage(layoutSize * devicePixelRatio, QImage::QImage::Format_ARGB32_Premultiplied);
QImage cache = QImage(layoutSize * devicePixelRatio, QImage::Format_ARGB32_Premultiplied);
cache.setDevicePixelRatio(devicePixelRatio);
QPainter cachedPainter(&cache);
@ -282,7 +300,7 @@ public:
class Fonts : public QWidget
{
public:
void paintEvent(QPaintEvent *event)
void paintEvent(QPaintEvent *)
{
QPainter painter(this);
int y = 40;
@ -333,28 +351,22 @@ void apiTest()
class IconDrawing : public QWidget
{
public:
QIcon *iconHighDPI;
QIcon *iconNormalDpi;
IconDrawing()
{
QFile::copy(":/qticon32.png", "/tmp/qticon32-2.png");
const QString tempPath = m_temporaryDir.path();
const QString path32 = tempPath + "/qticon32.png";
const QString path32_2 = tempPath + "/qticon32-2.png";
const QString path32_2x = tempPath + "/qticon32@2x.png";
QFile::copy(":/qticon32.png", "/tmp/qticon32.png");
QFile::copy(":/qticon32@2x.png", "/tmp/qticon32@2x.png");
QFile::copy(":/qticon32.png", path32_2);
QFile::copy(":/qticon32.png", path32);
QFile::copy(":/qticon32@2x.png", path32_2x);
iconHighDPI = new QIcon("/tmp/qticon32.png"); // will auto-load @2x version.
iconNormalDpi = new QIcon("/tmp/qticon32-2.png"); // does not have a 2x version.
iconHighDPI.reset(new QIcon(path32)); // will auto-load @2x version.
iconNormalDpi.reset(new QIcon(path32_2)); // does not have a 2x version.
}
~IconDrawing()
{
delete iconHighDPI;
delete iconNormalDpi;
// Qile::
}
void paintEvent(QPaintEvent *event)
void paintEvent(QPaintEvent *)
{
int x = 10;
int y = 10;
@ -366,7 +378,7 @@ public:
int sizeIncrement = 5;
// Disable high-dpi icons
qApp->setAttribute(Qt::AA_UseHighDpiPixmaps, false);
QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps, false);
// normal icon
for (int size = minSize; size < maxSize; size += sizeIncrement) {
@ -392,7 +404,7 @@ public:
y+=dy;
// Enable high-dpi icons
qApp->setAttribute(Qt::AA_UseHighDpiPixmaps, true);
QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps, true);
// normal icon
for (int size = minSize; size < maxSize; size += sizeIncrement) {
@ -417,7 +429,12 @@ public:
x = 10;
y+=dy;
};
}
private:
QTemporaryDir m_temporaryDir;
QScopedPointer<QIcon> iconHighDPI;
QScopedPointer<QIcon> iconNormalDpi;
};
// Icons on buttons
@ -456,38 +473,93 @@ public:
int main(int argc, char **argv)
{
QApplication app(argc, argv);
qApp->setAttribute(Qt::AA_UseHighDpiPixmaps);
QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
QCoreApplication::setApplicationVersion(QT_VERSION_STR);
PixmapPainter pixmapPainter;
pixmapPainter.show();
QCommandLineParser parser;
parser.setApplicationDescription("High DPI tester");
parser.addHelpOption();
parser.addVersionOption();
QCommandLineOption pixmapPainterOption("pixmap", "Test pixmap painter");
parser.addOption(pixmapPainterOption);
QCommandLineOption labelOption("label", "Test Labels");
parser.addOption(labelOption);
QCommandLineOption mainWindowOption("mainwindow", "Test QMainWindow");
parser.addOption(mainWindowOption);
QCommandLineOption standardIconsOption("standard-icons", "Test standard icons");
parser.addOption(standardIconsOption);
QCommandLineOption cachingOption("caching", "Test caching");
parser.addOption(cachingOption);
QCommandLineOption styleOption("styles", "Test style");
parser.addOption(styleOption);
QCommandLineOption fontsOption("fonts", "Test fonts");
parser.addOption(fontsOption);
QCommandLineOption iconDrawingOption("icondrawing", "Test icon drawing");
parser.addOption(iconDrawingOption);
QCommandLineOption buttonsOption("buttons", "Test buttons");
parser.addOption(buttonsOption);
Labels label;
label.resize(200, 200);
// label.show();
parser.process(app);
MainWindow mainWindow;
// mainWindow.show();
QScopedPointer<PixmapPainter> pixmapPainter;
if (parser.isSet(pixmapPainterOption)) {
pixmapPainter.reset(new PixmapPainter);
pixmapPainter->show();
}
StandardIcons icons;
icons.resize(510, 510);
// icons.show();
QScopedPointer<Labels> label;
if (parser.isSet(labelOption)) {
label.reset(new Labels);
label->resize(200, 200);
label->show();
}
Caching caching;
caching.resize(300, 300);
// caching.show();
QScopedPointer<MainWindow> mainWindow;
if (parser.isSet(mainWindowOption)) {
mainWindow.reset(new MainWindow);
mainWindow->show();
}
Style style;
// style.show();
QScopedPointer<StandardIcons> icons;
if (parser.isSet(standardIconsOption)) {
icons.reset(new StandardIcons);
icons->resize(510, 510);
icons->show();
}
Fonts fonts;
// fonts.show();
QScopedPointer<Caching> caching;
if (parser.isSet(cachingOption)) {
caching.reset(new Caching);
caching->resize(300, 300);
caching->show();
}
IconDrawing iconDrawing;
// iconDrawing.show();
QScopedPointer<Style> style;
if (parser.isSet(styleOption)) {
style.reset(new Style);
style->show();
}
Buttons buttons;
// buttons.show();
QScopedPointer<Fonts> fonts;
if (parser.isSet(fontsOption)) {
fonts.reset(new Fonts);
fonts->show();
}
QScopedPointer<IconDrawing> iconDrawing;
if (parser.isSet(iconDrawingOption)) {
iconDrawing.reset(new IconDrawing);
iconDrawing->show();
}
QScopedPointer<Buttons> buttons;
if (parser.isSet(buttonsOption)) {
buttons.reset(new Buttons);
buttons->show();
}
if (QApplication::topLevelWidgets().isEmpty())
parser.showHelp(0);
return app.exec();
}