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

macOS: Reorder QNSView instance variables 

Pick-to: 6.2
Change-Id: Icde9ee6744290f88eaa2ac197c40ba412543b122
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
bb10
Tor Arne Vestbø 2021-08-18 21:50:32 +02:00
parent fde6e1a18c
commit b601eb9c2d
1 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/plugins/platforms/cocoa/qnsview.mm
View File

@ -120,35 +120,35 @@ QT_NAMESPACE_ALIAS_OBJC_CLASS(QNSViewMouseMoveHelper);
@implementation QNSView {
QPointer<QCocoaWindow> m_platformWindow;
// Mouse
QNSViewMouseMoveHelper *m_mouseMoveHelper;
Qt::MouseButtons m_buttons;
Qt::MouseButtons m_acceptedMouseDowns;
Qt::MouseButtons m_frameStrutButtons;
QString m_composingText;
QPointer<QObject> m_composingFocusObject;
bool m_lastKeyDead;
bool m_sendKeyEvent;
Qt::KeyboardModifiers m_currentWheelModifiers;
bool m_dontOverrideCtrlLMB;
bool m_sendUpAsRightButton;
Qt::KeyboardModifiers m_currentWheelModifiers;
NSString *m_inputSource;
QNSViewMouseMoveHelper *m_mouseMoveHelper;
bool m_resendKeyEvent;
bool m_scrolling;
bool m_updatingDrag;
// Keys
bool m_lastKeyDead;
bool m_sendKeyEvent;
bool m_resendKeyEvent;
NSEvent *m_currentlyInterpretedKeyEvent;
QSet<quint32> m_acceptedKeyDowns;
// Text
NSString *m_inputSource;
QString m_composingText;
QPointer<QObject> m_composingFocusObject;
}
- (instancetype)initWithCocoaWindow:(QCocoaWindow *)platformWindow
{
if ((self = [super initWithFrame:NSZeroRect])) {
m_platformWindow = platformWindow;
m_lastKeyDead = false;
m_sendKeyEvent = false;
m_inputSource = nil;
m_resendKeyEvent = false;
m_updatingDrag = false;
m_currentlyInterpretedKeyEvent = nil;
self.focusRingType = NSFocusRingTypeNone;
@ -158,6 +158,15 @@ QT_NAMESPACE_ALIAS_OBJC_CLASS(QNSViewMouseMoveHelper);
[self initDrawing];
[self initMouse];
[self registerDragTypes];
m_updatingDrag = false;
m_lastKeyDead = false;
m_sendKeyEvent = false;
m_resendKeyEvent = false;
m_currentlyInterpretedKeyEvent = nil;
m_inputSource = nil;
}
return self;
}