AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix position of mouse events generated from touch events.

Browse Source 
In touch event terminology the global position is the screenPos,
scenePos is the windowPos.

Fixes a tst_qdeclarativepincharea test failure in qtquick1.

Change-Id: Ie98fe12be8cbedc9b019913b066e7c4bce75278d
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
This commit is contained in:
Andrew den Exter 2012-07-26 14:25:30 +10:00 committed by Qt by Nokia
parent a0373d8d36
commit 281d4995ec
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/widgets/kernel/qapplication.cpp
View File

@ -4424,7 +4424,7 @@ bool QApplicationPrivate::translateTouchToMouse(QWidget *widget, QTouchEvent *ev
if (eventType == QEvent::None)
continue;
const QPoint pos = widget->mapFromGlobal(p.scenePos().toPoint());
const QPoint pos = widget->mapFromGlobal(p.screenPos().toPoint());
QMouseEvent mouseEvent(eventType, pos,
Qt::LeftButton, Qt::LeftButton,

10
tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
View File

@ -9326,6 +9326,7 @@ protected:
case QEvent::MouseMove:
case QEvent::MouseButtonRelease:
++m_mouseEventCount;
m_lastMouseEventPos = static_cast<QMouseEvent *>(e)->localPos();
if (m_acceptMouse)
e->accept();
else
@ -9342,6 +9343,7 @@ public:
bool m_acceptTouch;
int m_mouseEventCount;
bool m_acceptMouse;
QPointF m_lastMouseEventPos;
};
void tst_QWidget::touchEventSynthesizedMouseEvent()
@ -9361,12 +9363,15 @@ void tst_QWidget::touchEventSynthesizedMouseEvent()
QTest::touchEvent(&widget, device).press(0, QPoint(10, 10), &widget);
QCOMPARE(widget.m_touchEventCount, 0);
QCOMPARE(widget.m_mouseEventCount, 1);
QCOMPARE(widget.m_lastMouseEventPos, QPointF(10, 10));
QTest::touchEvent(&widget, device).move(0, QPoint(15, 15), &widget);
QCOMPARE(widget.m_touchEventCount, 0);
QCOMPARE(widget.m_mouseEventCount, 2);
QCOMPARE(widget.m_lastMouseEventPos, QPointF(15, 15));
QTest::touchEvent(&widget, device).release(0, QPoint(20, 20), &widget);
QCOMPARE(widget.m_touchEventCount, 0);
QCOMPARE(widget.m_mouseEventCount, 3);
QCOMPARE(widget.m_lastMouseEventPos, QPointF(20, 20));
}
{
@ -9403,6 +9408,7 @@ void tst_QWidget::touchEventSynthesizedMouseEvent()
TouchMouseWidget parent;
parent.setAcceptTouch(true);
TouchMouseWidget child(&parent);
child.move(5, 5);
child.setAcceptMouse(false);
parent.show();
QVERIFY(QTest::qWaitForWindowExposed(parent.windowHandle()));
@ -9416,6 +9422,7 @@ void tst_QWidget::touchEventSynthesizedMouseEvent()
QCOMPARE(parent.m_mouseEventCount, 0);
QCOMPARE(child.m_touchEventCount, 0);
QCOMPARE(child.m_mouseEventCount, 1); // Attempt at mouse event before propagation
QCOMPARE(child.m_lastMouseEventPos, QPointF(10, 10));
}
{
@ -9427,6 +9434,7 @@ void tst_QWidget::touchEventSynthesizedMouseEvent()
TouchMouseWidget parent;
TouchMouseWidget child(&parent);
child.move(5, 5);
child.setAcceptMouse(false);
parent.show();
QVERIFY(QTest::qWaitForWindowExposed(parent.windowHandle()));
@ -9438,8 +9446,10 @@ void tst_QWidget::touchEventSynthesizedMouseEvent()
QTest::touchEvent(parent.window(), device).press(0, QPoint(10, 10), &child);
QCOMPARE(parent.m_touchEventCount, 0);
QCOMPARE(parent.m_mouseEventCount, 1);
QCOMPARE(parent.m_lastMouseEventPos, QPointF(15, 15));
QCOMPARE(child.m_touchEventCount, 0);
QCOMPARE(child.m_mouseEventCount, 1); // Attempt at mouse event before propagation
QCOMPARE(child.m_lastMouseEventPos, QPointF(10, 10));
}
}