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

Add qt.pointer.grab logging in QEventPoint

Browse Source 
Add the logging category qt.pointer.grab, which generalizes the
qt.quick.pointer.grab category in Qt 5 (and is almost always needed
for troubleshooting Qt Quick pointer-handling bugs).

Change-Id: I10b4f43aa60e8717d92ac43384d8fdeefd41d836
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
This commit is contained in:
Shawn Rutledge 2020-08-03 13:01:49 +02:00
parent 6d9ec41f6f
commit a95d4f68ee
1 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/gui/kernel/qevent.cpp
View File

@ -50,6 +50,7 @@
#include "qmimedata.h" #include "qmimedata.h"
#include "qevent_p.h" #include "qevent_p.h"
#include "qmath.h" #include "qmath.h"
#include "qloggingcategory.h"
#if QT_CONFIG(draganddrop) #if QT_CONFIG(draganddrop)
#include <qpa/qplatformdrag.h> #include <qpa/qplatformdrag.h>
@ -60,6 +61,18 @@
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
Q_LOGGING_CATEGORY(lcPointerGrab, "qt.pointer.grab")
static const QString pointDeviceName(const QEventPoint *point)
{
if (!point->event())
return {};
auto device = point->event()->device();
QString deviceName = (device ? device->name() : QLatin1String("null device"));
deviceName.resize(16, u' '); // shorten, and align in case of sequential output
return deviceName;
}
/*! /*!
\class QEnterEvent \class QEnterEvent
\ingroup events \ingroup events
@ -262,6 +275,12 @@ void QEventPoint::setAccepted(bool accepted)
*/ */
void QEventPoint::setExclusiveGrabber(QObject *exclusiveGrabber) void QEventPoint::setExclusiveGrabber(QObject *exclusiveGrabber)
{ {
if (m_exclusiveGrabber == exclusiveGrabber)
return;
if (Q_UNLIKELY(lcPointerGrab().isDebugEnabled())) {
qCDebug(lcPointerGrab) << pointDeviceName(this) << "point" << Qt::hex << m_pointId << m_state << "@" << m_scenePos
<< ": grab" << m_exclusiveGrabber << "->" << exclusiveGrabber;
}
m_exclusiveGrabber = exclusiveGrabber; m_exclusiveGrabber = exclusiveGrabber;
m_globalGrabPos = m_globalPos; m_globalGrabPos = m_globalPos;
} }
@ -276,10 +295,18 @@ void QEventPoint::setExclusiveGrabber(QObject *exclusiveGrabber)
void QEventPoint::setPassiveGrabbers(const QList<QPointer<QObject> > &grabbers) void QEventPoint::setPassiveGrabbers(const QList<QPointer<QObject> > &grabbers)
{ {
m_passiveGrabbers = grabbers; m_passiveGrabbers = grabbers;
if (Q_UNLIKELY(lcPointerGrab().isDebugEnabled())) {
qCDebug(lcPointerGrab) << pointDeviceName(this) << "point" << Qt::hex << m_pointId << m_state
<< ": grab (passive)" << grabbers;
}
} }
void QEventPoint::clearPassiveGrabbers() void QEventPoint::clearPassiveGrabbers()
{ {
if (Q_UNLIKELY(lcPointerGrab().isDebugEnabled())) {
qCDebug(lcPointerGrab) << pointDeviceName(this) << "point" << Qt::hex << m_pointId << m_state
<< ": clearing" << m_passiveGrabbers;
}
m_passiveGrabbers.clear(); m_passiveGrabbers.clear();
} }