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

Fix wrong local positions in mouse events when no tlw was given

Browse Source 
Calling handleMouseEvent() with w == 0 implies that the local position
is bogus and instead it should be calculated from the global position
once the target window is known.

Change-Id: If173d0570f6dcc8b7bc5d6f21fa1f69d06d9d702
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
This commit is contained in:
Laszlo Agocs 2012-05-23 15:38:22 +03:00 committed by Qt by Nokia
parent b5a11a7be5
commit cd8ff4fa8f
3 changed files with 34 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/gui/kernel/qguiapplication.cpp
View File

@ -1134,12 +1134,17 @@ void QGuiApplicationPrivate::processMouseEvent(QWindowSystemInterfacePrivate::Mo
QWindow *window = e->window.data(); QWindow *window = e->window.data();
modifier_buttons = e->modifiers; modifier_buttons = e->modifiers;
if (!window)
window = QGuiApplication::topLevelAt(e->globalPos.toPoint());
QPointF localPoint = e->localPos; QPointF localPoint = e->localPos;
QPointF globalPoint = e->globalPos; QPointF globalPoint = e->globalPos;
if (!window) {
window = QGuiApplication::topLevelAt(globalPoint.toPoint());
if (window) {
QPointF delta = globalPoint - globalPoint.toPoint();
localPoint = window->mapFromGlobal(globalPoint.toPoint()) + delta;
}
}
Qt::MouseButton button = Qt::NoButton; Qt::MouseButton button = Qt::NoButton;
bool doubleClick = false; bool doubleClick = false;

10
src/gui/kernel/qwindowsysteminterface_qpa.cpp
View File

@ -133,19 +133,19 @@ void QWindowSystemInterface::handleSynchronousCloseEvent(QWindow *tlw)
/*! /*!
\a tlw == 0 means that \a ev is in global coords only \a w == 0 means that the event is in global coords only, \a local will be ignored in this case
*/ */
void QWindowSystemInterface::handleMouseEvent(QWindow *w, const QPointF & local, const QPointF & global, Qt::MouseButtons b, Qt::KeyboardModifiers mods) { void QWindowSystemInterface::handleMouseEvent(QWindow *w, const QPointF & local, const QPointF & global, Qt::MouseButtons b, Qt::KeyboardModifiers mods)
{
unsigned long time = QWindowSystemInterfacePrivate::eventTime.elapsed(); unsigned long time = QWindowSystemInterfacePrivate::eventTime.elapsed();
handleMouseEvent(w, time, local, global, b, mods); handleMouseEvent(w, time, local, global, b, mods);
} }
void QWindowSystemInterface::handleMouseEvent(QWindow *tlw, ulong timestamp, const QPointF & local, const QPointF & global, Qt::MouseButtons b, Qt::KeyboardModifiers mods) void QWindowSystemInterface::handleMouseEvent(QWindow *w, ulong timestamp, const QPointF & local, const QPointF & global, Qt::MouseButtons b, Qt::KeyboardModifiers mods)
{ {
QWindowSystemInterfacePrivate::MouseEvent * e = QWindowSystemInterfacePrivate::MouseEvent * e =
new QWindowSystemInterfacePrivate::MouseEvent(tlw, timestamp, local, global, b, mods); new QWindowSystemInterfacePrivate::MouseEvent(w, timestamp, local, global, b, mods);
QWindowSystemInterfacePrivate::queueWindowSystemEvent(e); QWindowSystemInterfacePrivate::queueWindowSystemEvent(e);
} }

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

@ -328,6 +328,7 @@ public:
mouseSequenceSignature += 'p'; mouseSequenceSignature += 'p';
mousePressButton = event->button(); mousePressButton = event->button();
mousePressScreenPos = event->screenPos(); mousePressScreenPos = event->screenPos();
mousePressLocalPos = event->localPos();
if (spinLoopWhenPressed) if (spinLoopWhenPressed)
QCoreApplication::processEvents(); QCoreApplication::processEvents();
} }
@ -401,7 +402,7 @@ public:
int mousePressButton, mouseReleaseButton, mouseMoveButton; int mousePressButton, mouseReleaseButton, mouseMoveButton;
int mousePressedCount, mouseReleasedCount, mouseMovedCount, mouseDoubleClickedCount; int mousePressedCount, mouseReleasedCount, mouseMovedCount, mouseDoubleClickedCount;
QString mouseSequenceSignature; QString mouseSequenceSignature;
QPointF mousePressScreenPos, mouseMoveScreenPos; QPointF mousePressScreenPos, mouseMoveScreenPos, mousePressLocalPos;
int touchPressedCount, touchReleasedCount, touchMovedCount; int touchPressedCount, touchReleasedCount, touchMovedCount;
QEvent::Type touchEventType; QEvent::Type touchEventType;
@ -429,6 +430,7 @@ void tst_QWindow::testInputEvents()
QCoreApplication::processEvents(); QCoreApplication::processEvents();
QCOMPARE(window.mousePressButton, int(Qt::LeftButton)); QCOMPARE(window.mousePressButton, int(Qt::LeftButton));
QCOMPARE(window.mouseReleaseButton, int(Qt::LeftButton)); QCOMPARE(window.mouseReleaseButton, int(Qt::LeftButton));
QCOMPARE(window.mousePressLocalPos, local);
QList<QWindowSystemInterface::TouchPoint> points; QList<QWindowSystemInterface::TouchPoint> points;
QWindowSystemInterface::TouchPoint tp1, tp2; QWindowSystemInterface::TouchPoint tp1, tp2;
@ -446,6 +448,24 @@ void tst_QWindow::testInputEvents()
QCoreApplication::processEvents(); QCoreApplication::processEvents();
QTRY_COMPARE(window.touchPressedCount, 2); QTRY_COMPARE(window.touchPressedCount, 2);
QTRY_COMPARE(window.touchReleasedCount, 2); QTRY_COMPARE(window.touchReleasedCount, 2);
// Now with null pointer as window. local param should not be utilized:
// handleMouseEvent() with tlw == 0 means the event is in global coords only.
window.mousePressButton = window.mouseReleaseButton = 0;
QPointF nonWindowGlobal(500, 500); // not inside the window
QWindowSystemInterface::handleMouseEvent(0, nonWindowGlobal, nonWindowGlobal, Qt::LeftButton);
QWindowSystemInterface::handleMouseEvent(0, nonWindowGlobal, nonWindowGlobal, Qt::NoButton);
QCoreApplication::processEvents();
QCOMPARE(window.mousePressButton, 0);
QCOMPARE(window.mouseReleaseButton, 0);
QPointF windowGlobal = window.mapToGlobal(local.toPoint());
QWindowSystemInterface::handleMouseEvent(0, windowGlobal, windowGlobal, Qt::LeftButton);
QWindowSystemInterface::handleMouseEvent(0, windowGlobal, windowGlobal, Qt::NoButton);
QCoreApplication::processEvents();
QCOMPARE(window.mousePressButton, int(Qt::LeftButton));
QCOMPARE(window.mouseReleaseButton, int(Qt::LeftButton));
QCOMPARE(window.mousePressScreenPos, windowGlobal);
QCOMPARE(window.mousePressLocalPos, local); // the local we passed was bogus, verify that qGuiApp calculated the proper one
} }
void tst_QWindow::touchToMouseTranslation() void tst_QWindow::touchToMouseTranslation()