diff options
| author | Liang Qi <[email protected]> | 2024-06-28 11:31:15 +0200 |
|---|---|---|
| committer | Liang Qi <[email protected]> | 2024-07-01 14:16:55 +0000 |
| commit | 04b8b61ce56d552c1240a8f5e3f089edc7b56f52 (patch) | |
| tree | 1b93e0d6982d5d450bd00ab6f970dcf7771cb0fc | |
| parent | 3aca4589b06c6614538c9d96cd1c38e548499e82 (diff) | |
Revert "QGestureManager: use gesture owner target if topLevelAt returns nullptr"
This reverts commit 10c3dd87d3bc2e84d4f477888622f5fc7ed5d502.
QtWidgets depends on the old QApplication::topLevelAt() behavior too
much, especially for the single top level window case. It's not easy
to be decoupled in this way.
Task-number: QTBUG-113404
Task-number: QTBUG-125878
Task-number: QTBUG-126313
Pick-to: 6.8 6.7 6.5
Change-Id: Ica9753bfc85f54ef24ff3db12ea954b06b50b1f0
Reviewed-by: Volker Hilsheimer <[email protected]>
| -rw-r--r-- | src/widgets/kernel/qgesturemanager.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/widgets/kernel/qgesturemanager.cpp b/src/widgets/kernel/qgesturemanager.cpp index 35f8a1b6412..558ad7c34ae 100644 --- a/src/widgets/kernel/qgesturemanager.cpp +++ b/src/widgets/kernel/qgesturemanager.cpp @@ -610,8 +610,7 @@ void QGestureManager::deliverEvents(const QSet<QGesture *> &gestures, QWidget *child = topLevel->childAt(topLevel->mapFromGlobal(pt)); target = child ? child : topLevel; } - } - if (!target) { + } else { // or use the context of the gesture QObject *context = m_gestureOwners.value(gesture, 0); if (context->isWidgetType()) |