macOS: Add missing m_ prefix to QNSView currentWheelModifiers member
Change-Id: I057db59797f1e18c3a8fc5386f7e1295fe352e02 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
This commit is contained in:
parent
012af8abf8
commit
2d01de4e87
@ -125,7 +125,7 @@
|
||||
bool m_sendKeyEvent;
|
||||
bool m_dontOverrideCtrlLMB;
|
||||
bool m_sendUpAsRightButton;
|
||||
Qt::KeyboardModifiers currentWheelModifiers;
|
||||
Qt::KeyboardModifiers m_currentWheelModifiers;
|
||||
#ifndef QT_NO_OPENGL
|
||||
QCocoaGLContext *m_glContext;
|
||||
bool m_shouldSetGLContextinDrawRect;
|
||||
|
@ -574,9 +574,8 @@
|
||||
// after scrolling in Qt Creator: not taking the phase into account causes
|
||||
// the end of the event stream to be interpreted as font size changes.
|
||||
NSEventPhase momentumPhase = [theEvent momentumPhase];
|
||||
if (momentumPhase == NSEventPhaseNone) {
|
||||
currentWheelModifiers = [QNSView convertKeyModifiers:[theEvent modifierFlags]];
|
||||
}
|
||||
if (momentumPhase == NSEventPhaseNone)
|
||||
m_currentWheelModifiers = [QNSView convertKeyModifiers:[theEvent modifierFlags]];
|
||||
|
||||
NSEventPhase phase = [theEvent phase];
|
||||
Qt::ScrollPhase ph = Qt::ScrollUpdate;
|
||||
@ -601,7 +600,7 @@
|
||||
bool isInverted = [theEvent isDirectionInvertedFromDevice];
|
||||
|
||||
qCDebug(lcQpaMouse) << "scroll wheel @ window pos" << qt_windowPoint << "delta px" << pixelDelta << "angle" << angleDelta << "phase" << ph << (isInverted ? "inverted" : "");
|
||||
QWindowSystemInterface::handleWheelEvent(m_platformWindow->window(), qt_timestamp, qt_windowPoint, qt_screenPoint, pixelDelta, angleDelta, currentWheelModifiers, ph, source, isInverted);
|
||||
QWindowSystemInterface::handleWheelEvent(m_platformWindow->window(), qt_timestamp, qt_windowPoint, qt_screenPoint, pixelDelta, angleDelta, m_currentWheelModifiers, ph, source, isInverted);
|
||||
}
|
||||
#endif // QT_CONFIG(wheelevent)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user