whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename QTabletEvent::m_zTilt to m_z 

This is a z coordinate unrelated to tilt, AFAIK.
Amends ea2ae140e9

Change-Id: If165df3af290fbe7c2e5bfa94d578175debd53cd
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
bb10
Shawn Rutledge 2020-08-25 15:45:13 +02:00
parent fab8933d5b
commit 5449bddb04
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2384,7 +2384,7 @@ QTabletEvent::QTabletEvent(Type type, const QPointingDevice *dev, const QPointF
: QSinglePointEvent(type, dev, pos, pos, globalPos, button, buttons, keyState),
m_xTilt(xTilt),
m_yTilt(yTilt),
m_zTilt(z),
m_z(z),
m_tangential(tangentialPressure)
{
QMutableEventPoint &mut = QMutableEventPoint::from(m_point);

4
src/gui/kernel/qevent.h
View File

@ -418,14 +418,14 @@ public:
#endif
inline qreal pressure() const { return point(0).pressure(); }
inline qreal rotation() const { return point(0).rotation(); }
inline int z() const { return m_zTilt; }
inline int z() const { return m_z; }
inline qreal tangentialPressure() const { return m_tangential; }
inline int xTilt() const { return m_xTilt; }
inline int yTilt() const { return m_yTilt; }
protected:
quint32 m_reserved : 16;
int m_xTilt, m_yTilt, m_zTilt;
int m_xTilt, m_yTilt, m_z;
qreal m_tangential;
};
#endif // QT_CONFIG(tabletevent)