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

Add QWindow child window positioning test

Browse Source 
Tests that window creation order doesn't affect the resulting geometry
of the parent and child windows.

Change-Id: Iff0cb5adf87107dfed4a633a67e1b4312b90e24a
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
This commit is contained in:
Tor Arne Vestbø 2015-10-16 17:36:20 +02:00
parent 73c86fcb40
commit 2bebf640cc
1 changed files with 69 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
View File

@ -67,6 +67,8 @@ private slots:
void positioning_data(); void positioning_data();
void positioning(); void positioning();
void positioningDuringMinimized(); void positioningDuringMinimized();
void childWindowPositioning_data();
void childWindowPositioning();
void platformSurface(); void platformSurface();
void isExposed(); void isExposed();
void isActive(); void isActive();
@ -320,6 +322,19 @@ private:
QPlatformSurfaceEvent::SurfaceEventType m_surfaceventType; QPlatformSurfaceEvent::SurfaceEventType m_surfaceventType;
}; };
class ColoredWindow : public QRasterWindow {
public:
explicit ColoredWindow(const QColor &color, QWindow *parent = 0) : QRasterWindow(parent), m_color(color) {}
void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE
{
QPainter p(this);
p.fillRect(QRect(QPoint(0, 0), size()), m_color);
}
private:
const QColor m_color;
};
void tst_QWindow::eventOrderOnShow() void tst_QWindow::eventOrderOnShow()
{ {
// Some platforms enforce minimum widths for windows, which can cause extra resize // Some platforms enforce minimum widths for windows, which can cause extra resize
@ -502,6 +517,60 @@ void tst_QWindow::positioningDuringMinimized()
QTRY_COMPARE(window.geometry(), newGeometry); QTRY_COMPARE(window.geometry(), newGeometry);
} }
void tst_QWindow::childWindowPositioning_data()
{
QTest::addColumn<bool>("showInsteadOfCreate");
QTest::newRow("create") << false;
QTest::newRow("show") << true;
}
void tst_QWindow::childWindowPositioning()
{
const QPoint topLeftOrigin(0, 0);
ColoredWindow topLevelWindowFirst(Qt::green);
topLevelWindowFirst.setObjectName("topLevelWindowFirst");
ColoredWindow childWindowAfter(Qt::yellow, &topLevelWindowFirst);
childWindowAfter.setObjectName("childWindowAfter");
topLevelWindowFirst.setFramePosition(m_availableTopLeft);
childWindowAfter.setFramePosition(topLeftOrigin);
ColoredWindow topLevelWindowAfter(Qt::green);
topLevelWindowAfter.setObjectName("topLevelWindowAfter");
ColoredWindow childWindowFirst(Qt::yellow, &topLevelWindowAfter);
childWindowFirst.setObjectName("childWindowFirst");
topLevelWindowAfter.setFramePosition(m_availableTopLeft);
childWindowFirst.setFramePosition(topLeftOrigin);
QFETCH(bool, showInsteadOfCreate);
QWindow* windows[] = { &topLevelWindowFirst, &childWindowAfter, &childWindowFirst, &topLevelWindowAfter, 0 };
for (int i = 0; windows[i]; ++i) {
QWindow *window = windows[i];
if (showInsteadOfCreate) {
window->showNormal();
} else {
window->create();
}
}
if (showInsteadOfCreate) {
QVERIFY(QTest::qWaitForWindowExposed(&topLevelWindowFirst));
QVERIFY(QTest::qWaitForWindowExposed(&topLevelWindowAfter));
}
// Creation order shouldn't affect the geometry
QCOMPARE(topLevelWindowFirst.geometry(), topLevelWindowAfter.geometry());
QCOMPARE(childWindowAfter.geometry(), childWindowFirst.geometry());
// Creation order shouldn't affect the child ending up at 0,0
QCOMPARE(childWindowFirst.framePosition(), topLeftOrigin);
QCOMPARE(childWindowAfter.framePosition(), topLeftOrigin);
}
class PlatformWindowFilter : public QObject class PlatformWindowFilter : public QObject
{ {
Q_OBJECT Q_OBJECT
@ -1773,19 +1842,6 @@ void tst_QWindow::modalWindowPosition()
QCOMPARE(window.geometry(), origGeo); QCOMPARE(window.geometry(), origGeo);
} }
class ColoredWindow : public QRasterWindow {
public:
explicit ColoredWindow(const QColor &color, QWindow *parent = 0) : QRasterWindow(parent), m_color(color) {}
void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE
{
QPainter p(this);
p.fillRect(QRect(QPoint(0, 0), size()), m_color);
}
private:
const QColor m_color;
};
static bool isNativeWindowVisible(const QWindow *window) static bool isNativeWindowVisible(const QWindow *window)
{ {
#if defined(Q_OS_WIN) && !defined(Q_OS_WINCE) && !defined(Q_OS_WINRT) #if defined(Q_OS_WIN) && !defined(Q_OS_WINCE) && !defined(Q_OS_WINRT)