1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tst_qgraphicsivew: Run Motif scrollbar range tests only at 96DPI.

Browse Source 
Preparing the introduction of a change that uses the actual
QScreen resolution in the style helper.

Change-Id: I3fbb36b0d6a34904c875a2e3684d73124f534bed
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
This commit is contained in:
Friedemann Kleint 2012-01-10 12:16:33 +01:00 committed by Qt by Nokia
parent 75af95cbeb
commit 00d4b15112
1 changed files with 15 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview_2.cpp
View File

@ -39,23 +39,11 @@
** **
****************************************************************************/ ****************************************************************************/
#include <QtTest/QtTest> #include <QtTest/QtTest>
#include <QSize> #include <QtCore/QSize>
#include <QRectF> #include <QtCore/QRectF>
#include <QTransform> #include <QtGui/QTransform>
#include <QtGui/QGuiApplication>
#ifdef Q_OS_WINCE #include <QtGui/QScreen>
#include <qguifunctions_wince.h>
bool qt_wince_is_high_dpi() {
HDC deviceContext = GetDC(0);
int dpi = GetDeviceCaps(deviceContext, LOGPIXELSX);
ReleaseDC(0, deviceContext);
if ((dpi < 1000) && (dpi > 0))
return dpi > 96;
else
return false;
}
#endif
Q_DECLARE_METATYPE(QList<int>) Q_DECLARE_METATYPE(QList<int>)
Q_DECLARE_METATYPE(QList<QRectF>) Q_DECLARE_METATYPE(QList<QRectF>)
@ -286,7 +274,7 @@ static void _scrollBarRanges_data_1(int offset)
<< -200 << (50 + 16) << -200 << (100 + 16) << false << false; << -200 << (50 + 16) << -200 << (100 + 16) << false << false;
} }
static void _scrollBarRanges_data_2(int offset) static void _scrollBarRangesMotif_data_1(int offset)
{ {
// Motif, flat frame // Motif, flat frame
QTest::newRow("Motif, 1") << QSize(150, 100) << QRectF(0, 0, 150, 100) << QTransform() QTest::newRow("Motif, 1") << QSize(150, 100) << QRectF(0, 0, 150, 100) << QTransform()
@ -507,7 +495,7 @@ static void _scrollBarRanges_data_2(int offset)
<< -200 << (50 + 16) << -200 << (100 + 16) << true << false; << -200 << (50 + 16) << -200 << (100 + 16) << true << false;
} }
static void _scrollBarRanges_data_3(int offset) static void _scrollBarRanges_data_2(int offset)
{ {
// No motif, styled panel // No motif, styled panel
QTest::newRow("Styled, 1") << QSize(150, 100) << QRectF(0, 0, 150, 100) << QTransform() QTest::newRow("Styled, 1") << QSize(150, 100) << QRectF(0, 0, 150, 100) << QTransform()
@ -728,7 +716,7 @@ static void _scrollBarRanges_data_3(int offset)
<< -200 << (50 + 16) << -200 << (100 + 16) << false << true; << -200 << (50 + 16) << -200 << (100 + 16) << false << true;
} }
static void _scrollBarRanges_data_4(int offset) static void _scrollBarRangesMotif_data_2(int offset)
{ {
// Motif, styled panel // Motif, styled panel
QTest::newRow("Motif, Styled, 1") << QSize(150, 100) << QRectF(0, 0, 150, 100) << QTransform() QTest::newRow("Motif, Styled, 1") << QSize(150, 100) << QRectF(0, 0, 150, 100) << QTransform()
@ -963,14 +951,14 @@ void _scrollBarRanges_data()
QTest::addColumn<bool>("useMotif"); QTest::addColumn<bool>("useMotif");
QTest::addColumn<bool>("useStyledPanel"); QTest::addColumn<bool>("useStyledPanel");
int offset = 16; const int offset = 16;
#ifdef Q_OS_WINCE
if (qt_wince_is_high_dpi())
offset *= 2;
#endif
_scrollBarRanges_data_1(offset); _scrollBarRanges_data_1(offset);
_scrollBarRanges_data_2(offset); _scrollBarRanges_data_2(offset);
_scrollBarRanges_data_3(offset); // Motif tests are suitable for 96 DPI, only.
_scrollBarRanges_data_4(offset); const QScreen *screen = QGuiApplication::primaryScreen();
if (screen && qFuzzyCompare(screen->logicalDotsPerInchX(), 96.0)) {
_scrollBarRangesMotif_data_1(offset);
_scrollBarRangesMotif_data_2(offset);
}
} }