qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

QQuickDeliverAgent: change sendHoverEvent signature 

Now we intend to always send pre-accepted hover events,
for consistency with event delivery in the rest of Qt.

This is mostly done as a preparation for later patches.

Change-Id: I5833b5ed9971057ace272a7bfc390fd336cc2e7d
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
This commit is contained in:
Richard Moe Gustavsen 2021-03-06 15:09:12 +01:00 committed by Shawn Rutledge
parent ccecd6e883
commit 220e6a5a76
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/quick/util/qquickdeliveryagent.cpp
View File

@ -603,7 +603,7 @@ bool QQuickDeliveryAgentPrivate::clearHover(ulong timestamp)
bool accepted = false; bool accepted = false;
for (QQuickItem* item : qAsConst(hoverItems)) { for (QQuickItem* item : qAsConst(hoverItems)) {
if (item) if (item)
accepted = sendHoverEvent(QEvent::HoverLeave, item, pos, pos, QGuiApplication::keyboardModifiers(), timestamp, true) || accepted; accepted = sendHoverEvent(QEvent::HoverLeave, item, pos, pos, QGuiApplication::keyboardModifiers(), timestamp) || accepted;
} }
hoverItems.clear(); hoverItems.clear();
return accepted; return accepted;
@ -914,15 +914,14 @@ void QQuickDeliveryAgentPrivate::deliverToPassiveGrabbers(const QVector<QPointer
bool QQuickDeliveryAgentPrivate::sendHoverEvent(QEvent::Type type, QQuickItem *item, bool QQuickDeliveryAgentPrivate::sendHoverEvent(QEvent::Type type, QQuickItem *item,
const QPointF &scenePos, const QPointF &lastScenePos, const QPointF &scenePos, const QPointF &lastScenePos,
Qt::KeyboardModifiers modifiers, ulong timestamp, Qt::KeyboardModifiers modifiers, ulong timestamp)
bool accepted)
{ {
const QTransform transform = QQuickItemPrivate::get(item)->windowToItemTransform(); const QTransform transform = QQuickItemPrivate::get(item)->windowToItemTransform();
//create copy of event //create copy of event
QHoverEvent hoverEvent(type, transform.map(scenePos), transform.map(lastScenePos), modifiers); QHoverEvent hoverEvent(type, transform.map(scenePos), transform.map(lastScenePos), modifiers);
hoverEvent.setTimestamp(timestamp); hoverEvent.setTimestamp(timestamp);
hoverEvent.setAccepted(accepted); hoverEvent.setAccepted(true);
hasFiltered.clear(); hasFiltered.clear();
if (sendFilteredMouseEvent(&hoverEvent, item, item->parentItem())) if (sendFilteredMouseEvent(&hoverEvent, item, item->parentItem()))
@ -977,7 +976,7 @@ bool QQuickDeliveryAgentPrivate::deliverHoverEvent(QQuickItem *item, const QPoin
if (itemPrivate->hoverEnabled && item->contains(itemPos)) { if (itemPrivate->hoverEnabled && item->contains(itemPos)) {
if (!hoverItems.isEmpty() && hoverItems.at(0) == item) { if (!hoverItems.isEmpty() && hoverItems.at(0) == item) {
//move //move
accepted = sendHoverEvent(QEvent::HoverMove, item, scenePos, lastScenePos, modifiers, timestamp, accepted); accepted = sendHoverEvent(QEvent::HoverMove, item, scenePos, lastScenePos, modifiers, timestamp);
} else { } else {
QList<QQuickItem *> itemsToHover; QList<QQuickItem *> itemsToHover;
QQuickItem* parent = item; QQuickItem* parent = item;
@ -989,12 +988,12 @@ bool QQuickDeliveryAgentPrivate::deliverHoverEvent(QQuickItem *item, const QPoin
while (!hoverItems.isEmpty() && !itemsToHover.contains(hoverItems.at(0))) { while (!hoverItems.isEmpty() && !itemsToHover.contains(hoverItems.at(0))) {
QQuickItem *hoverLeaveItem = hoverItems.takeFirst(); QQuickItem *hoverLeaveItem = hoverItems.takeFirst();
if (hoverLeaveItem) if (hoverLeaveItem)
sendHoverEvent(QEvent::HoverLeave, hoverLeaveItem, scenePos, lastScenePos, modifiers, timestamp, accepted); sendHoverEvent(QEvent::HoverLeave, hoverLeaveItem, scenePos, lastScenePos, modifiers, timestamp);
} }
if (!hoverItems.isEmpty() && hoverItems.at(0) == item) {//Not entering a new Item if (!hoverItems.isEmpty() && hoverItems.at(0) == item) {//Not entering a new Item
// ### Shouldn't we send moves for the parent items as well? // ### Shouldn't we send moves for the parent items as well?
accepted = sendHoverEvent(QEvent::HoverMove, item, scenePos, lastScenePos, modifiers, timestamp, accepted); accepted = sendHoverEvent(QEvent::HoverMove, item, scenePos, lastScenePos, modifiers, timestamp);
} else { } else {
// Enter items that are not entered yet. // Enter items that are not entered yet.
int startIdx = -1; int startIdx = -1;
@ -1013,7 +1012,7 @@ bool QQuickDeliveryAgentPrivate::deliverHoverEvent(QQuickItem *item, const QPoin
// itemToHoverPrivate->window here prevents that case. // itemToHoverPrivate->window here prevents that case.
if (itemToHoverPrivate->window == itemPrivate->window && itemToHoverPrivate->hoverEnabled) { if (itemToHoverPrivate->window == itemPrivate->window && itemToHoverPrivate->hoverEnabled) {
hoverItems.prepend(itemToHover); hoverItems.prepend(itemToHover);
sendHoverEvent(QEvent::HoverEnter, itemToHover, scenePos, lastScenePos, modifiers, timestamp, accepted); sendHoverEvent(QEvent::HoverEnter, itemToHover, scenePos, lastScenePos, modifiers, timestamp);
} }
} }
} }

2
src/quick/util/qquickdeliveryagent_p_p.h
View File

@ -187,7 +187,7 @@ public:
// hover delivery // hover delivery
bool deliverHoverEvent(QQuickItem *, const QPointF &scenePos, const QPointF &lastScenePos, Qt::KeyboardModifiers modifiers, ulong timestamp, bool &accepted); bool deliverHoverEvent(QQuickItem *, const QPointF &scenePos, const QPointF &lastScenePos, Qt::KeyboardModifiers modifiers, ulong timestamp, bool &accepted);
bool sendHoverEvent(QEvent::Type, QQuickItem *, const QPointF &scenePos, const QPointF &lastScenePos, bool sendHoverEvent(QEvent::Type, QQuickItem *, const QPointF &scenePos, const QPointF &lastScenePos,
Qt::KeyboardModifiers modifiers, ulong timestamp, bool accepted); Qt::KeyboardModifiers modifiers, ulong timestamp);
bool clearHover(ulong timestamp = 0); bool clearHover(ulong timestamp = 0);
#if QT_CONFIG(quick_draganddrop) #if QT_CONFIG(quick_draganddrop)