diff options
| author | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-01-19 15:00:05 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-01-20 19:59:23 +0100 |
| commit | 0b62cd8da7d8ee078b799b95088a63626099caa4 (patch) | |
| tree | 11961286788da1012e8df89e4b15c95a9ee912c6 /tests | |
| parent | 8c5b3c6d912709d4db9624bb999b3166a27ee189 (diff) | |
Windows: Fix coordinate offset when positioning the taskbar on the left.
For windows that do not have WS_EX_TOOLWINDOW set, the WINDOWPLACEMENT
API uses workspace/available aera coordinates. Introduce a helper
function to return the offset and use that.
Task-number: QTBUG-43872
Change-Id: I329c640f180524699b45b855b4583f447c4a0987
Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp index 562328810e..d977f78b23 100644 --- a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp +++ b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp @@ -4696,8 +4696,9 @@ void tst_QWidget::setWindowGeometry() void tst_QWidget::setGeometry_win() { QWidget widget; + setFrameless(&widget); - widget.setGeometry(0, 600, 100,100); + widget.setGeometry(QRect(m_availableTopLeft + QPoint(0, 600), QSize(100, 100))); widget.show(); widget.setWindowState(widget.windowState() | Qt::WindowMaximized); QRect geom = widget.normalGeometry(); @@ -4707,8 +4708,10 @@ void tst_QWidget::setGeometry_win() widget.show(); RECT rt; ::GetWindowRect(winHandleOf(&widget), &rt); - QVERIFY2(rt.left <= 0, msgComparisonFailed(int(rt.left), "<=", 0)); - QVERIFY2(rt.top <= 0, msgComparisonFailed(int(rt.top), "<=", 0)); + QVERIFY2(rt.left <= m_availableTopLeft.x(), + msgComparisonFailed(int(rt.left), "<=", m_availableTopLeft.x())); + QVERIFY2(rt.top <= m_availableTopLeft.y(), + msgComparisonFailed(int(rt.top), "<=", m_availableTopLeft.y())); } #endif // defined (Q_OS_WIN) && !defined(Q_OS_WINCE) && !defined(Q_OS_WINRT) |