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

fixed mouseMove 

Change-Id: I95dd22ed3216f5ad169393f535e27b1b397c8433
Reviewed-on: http://codereview.qt-project.org/4462
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
bb10
Matthew Cattell 2011-09-08 15:37:59 +02:00 committed by Samuel Rødal
parent 78bb937e15
commit 1762bf3394
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/testlib/qtestmouse.h
View File

@ -125,12 +125,15 @@ namespace QTest
}
}
static void mouseEvent(MouseAction action, QWindow *window, Qt::MouseButton button,
Qt::KeyboardModifiers stateKey, QPoint pos, int delay=-1)
{
QTEST_ASSERT(window);
extern int Q_TESTLIB_EXPORT defaultMouseDelay();
static Qt::MouseButton lastButton = Qt::NoButton;
if (delay == -1 || delay < defaultMouseDelay())
delay = defaultMouseDelay();
if (delay > 0)
@ -153,22 +156,25 @@ namespace QTest
switch (action)
{
case MousePress:
QWindowSystemInterface::handleMouseEvent(window,pos,window->mapToGlobal(pos),Qt::LeftButton);
QWindowSystemInterface::handleMouseEvent(window,pos,window->mapToGlobal(pos),button);
lastButton = button;
break;
case MouseRelease:
QWindowSystemInterface::handleMouseEvent(window,pos,window->mapToGlobal(pos),Qt::NoButton);
lastButton = Qt::NoButton;
break;
case MouseDClick:
QWindowSystemInterface::handleMouseEvent(window,pos,window->mapToGlobal(pos),Qt::LeftButton);
QWindowSystemInterface::handleMouseEvent(window,pos,window->mapToGlobal(pos),button);
qWait(10);
QWindowSystemInterface::handleMouseEvent(window,pos,window->mapToGlobal(pos),Qt::NoButton);
qWait(20);
QWindowSystemInterface::handleMouseEvent(window,pos,window->mapToGlobal(pos),Qt::LeftButton);
QWindowSystemInterface::handleMouseEvent(window,pos,window->mapToGlobal(pos),button);
qWait(10);
QWindowSystemInterface::handleMouseEvent(window,pos,window->mapToGlobal(pos),Qt::NoButton);
break;
case MouseMove:
QCursor::setPos(window->mapToGlobal(pos));
QWindowSystemInterface::handleMouseEvent(window,pos,window->mapToGlobal(pos),lastButton);
//QCursor::setPos(window->mapToGlobal(pos));
#ifdef QT_MAC_USE_COCOA
QTest::qWait(20);
#else
@ -208,7 +214,7 @@ namespace QTest
inline void mouseDClick(QWindow *window, Qt::MouseButton button, Qt::KeyboardModifiers stateKey = 0,
QPoint pos = QPoint(), int delay=-1)
{ mouseEvent(MouseDClick, window, button, stateKey, pos, delay); }
inline void mouseMove(QWindow *window, QPoint pos = QPoint(), int delay=-1)
inline void mouseMove(QWindow *window, QPoint pos = QPoint(), int delay= -1)
{ mouseEvent(MouseMove, window, Qt::NoButton, 0, pos, delay); }
}