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

Fix mouse test event in window warning message.

Browse Source 
The tests use local coordinates, but window->geometry() gives the
global position on the window, i.e. offset by the size of the
decoration.

Change-Id: Id63ffd7e160b77ddb0f5563d8c3c65c36ad45e89
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
This commit is contained in:
Martin Jones 2013-08-17 15:49:33 +10:00 committed by The Qt Project
parent d20f003f36
commit c210668346
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/testlib/qtestmouse.h
View File

@ -61,6 +61,8 @@
#include <QtWidgets/qwidget.h> #include <QtWidgets/qwidget.h>
#endif #endif
#include <QDebug>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
Q_GUI_EXPORT void qt_handleMouseEvent(QWindow *w, const QPointF & local, const QPointF & global, Qt::MouseButtons b, Qt::KeyboardModifiers mods = Qt::NoModifier); Q_GUI_EXPORT void qt_handleMouseEvent(QWindow *w, const QPointF & local, const QPointF & global, Qt::MouseButtons b, Qt::KeyboardModifiers mods = Qt::NoModifier);
@ -84,8 +86,10 @@ namespace QTest
QTEST_ASSERT(window); QTEST_ASSERT(window);
extern int Q_TESTLIB_EXPORT defaultMouseDelay(); extern int Q_TESTLIB_EXPORT defaultMouseDelay();
if (!window->geometry().contains(pos)) // pos is in window local coordinates
if (window->geometry().width() <= pos.x() || window->geometry().height() <= pos.y()) {
QTest::qWarn("Mouse event occurs outside of target window."); QTest::qWarn("Mouse event occurs outside of target window.");
}
static Qt::MouseButton lastButton = Qt::NoButton; static Qt::MouseButton lastButton = Qt::NoButton;