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

Fix double click handling.

Browse Source 
Until now double clicking in Qt 5 resulted in the following sequence of mouse
events: pressed, released, double clicked, released. This is wrong, the press
belonging to the second button down is missing. In Qt 4 that pressed event is
present.

The problem is not apparent in desktop environments because the double click is
functioning properly even when the second pressed is missing. However when
using a platform plug-in like wayland, where the clients receive only press,
move and release events, double click was broken because the second click was
effectively ignored (due to receiving nothing but a button release).

Change-Id: Ief6af12c666b23e544da4a68cb835cd577265469
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
This commit is contained in:
Laszlo Agocs 2012-03-06 16:09:09 +02:00 committed by Qt by Nokia
parent eddabd2395
commit b371f3f943
1 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -933,6 +933,7 @@ void QGuiApplicationPrivate::processMouseEvent(QWindowSystemInterfacePrivate::Mo
QPointF globalPoint = e->globalPos; QPointF globalPoint = e->globalPos;
Qt::MouseButton button = Qt::NoButton; Qt::MouseButton button = Qt::NoButton;
bool doubleClick = false;
if (QGuiApplicationPrivate::lastCursorPosition != globalPoint) { if (QGuiApplicationPrivate::lastCursorPosition != globalPoint) {
type = QEvent::MouseMove; type = QEvent::MouseMove;
@ -940,8 +941,7 @@ void QGuiApplicationPrivate::processMouseEvent(QWindowSystemInterfacePrivate::Mo
if (qAbs(globalPoint.x() - mousePressX) > mouse_double_click_distance|| if (qAbs(globalPoint.x() - mousePressX) > mouse_double_click_distance||
qAbs(globalPoint.y() - mousePressY) > mouse_double_click_distance) qAbs(globalPoint.y() - mousePressY) > mouse_double_click_distance)
mousePressButton = Qt::NoButton; mousePressButton = Qt::NoButton;
} } else { // Check to see if a new button has been pressed/released.
else { // Check to see if a new button has been pressed/released.
for (int check = Qt::LeftButton; for (int check = Qt::LeftButton;
check <= int(Qt::MaxMouseButton); check <= int(Qt::MaxMouseButton);
check = check << 1) { check = check << 1) {
@ -956,25 +956,19 @@ void QGuiApplicationPrivate::processMouseEvent(QWindowSystemInterfacePrivate::Mo
} }
buttons = e->buttons; buttons = e->buttons;
if (button & e->buttons) { if (button & e->buttons) {
if ((e->timestamp - mousePressTime) < static_cast<ulong>(qApp->styleHints()->mouseDoubleClickInterval()) && ulong doubleClickInterval = static_cast<ulong>(qApp->styleHints()->mouseDoubleClickInterval());
button == mousePressButton) { doubleClick = e->timestamp - mousePressTime < doubleClickInterval && button == mousePressButton;
type = QEvent::MouseButtonDblClick; type = QEvent::MouseButtonPress;
mousePressButton = Qt::NoButton; mousePressTime = e->timestamp;
} mousePressButton = button;
else { const QPoint point = QGuiApplicationPrivate::lastCursorPosition.toPoint();
type = QEvent::MouseButtonPress; mousePressX = point.x();
mousePressTime = e->timestamp; mousePressY = point.y();
mousePressButton = button; } else {
const QPoint point = QGuiApplicationPrivate::lastCursorPosition.toPoint();
mousePressX = point.x();
mousePressY = point.y();
}
}
else
type = QEvent::MouseButtonRelease; type = QEvent::MouseButtonRelease;
}
} }
if (window) { if (window) {
QMouseEvent ev(type, localPoint, localPoint, globalPoint, button, buttons, e->modifiers); QMouseEvent ev(type, localPoint, localPoint, globalPoint, button, buttons, e->modifiers);
ev.setTimestamp(e->timestamp); ev.setTimestamp(e->timestamp);
@ -1017,12 +1011,16 @@ void QGuiApplicationPrivate::processMouseEvent(QWindowSystemInterfacePrivate::Mo
fake.synthetic = true; fake.synthetic = true;
processTouchEvent(&fake); processTouchEvent(&fake);
} }
if (doubleClick) {
mousePressButton = Qt::NoButton;
QMouseEvent dblClickEvent(QEvent::MouseButtonDblClick, localPoint, localPoint, globalPoint,
button, buttons, e->modifiers);
dblClickEvent.setTimestamp(e->timestamp);
QGuiApplication::sendSpontaneousEvent(window, &dblClickEvent);
}
} }
} }
//### there's a lot of duplicated logic here -- refactoring required!
void QGuiApplicationPrivate::processWheelEvent(QWindowSystemInterfacePrivate::WheelEvent *e) void QGuiApplicationPrivate::processWheelEvent(QWindowSystemInterfacePrivate::WheelEvent *e)
{ {
if (!e->window) if (!e->window)
@ -1041,8 +1039,6 @@ void QGuiApplicationPrivate::processWheelEvent(QWindowSystemInterfacePrivate::Wh
} }
} }
// Remember, Qt convention is: keyboard state is state *before* // Remember, Qt convention is: keyboard state is state *before*
void QGuiApplicationPrivate::processKeyEvent(QWindowSystemInterfacePrivate::KeyEvent *e) void QGuiApplicationPrivate::processKeyEvent(QWindowSystemInterfacePrivate::KeyEvent *e)