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

macOS: Merge the two QNSView initializers

Browse Source 
We never call [QNSView init] directly, so there's no point in splitting
up the logic.

Change-Id: Ie40705a3a78c0d732a3f3378c6e8fa76dc6c68e7
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
This commit is contained in:
Tor Arne Vestbø 2018-07-06 17:40:40 +02:00
parent 23e20e4030
commit 573c81da9b
1 changed files with 22 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -141,9 +141,10 @@
bool m_updateRequested; bool m_updateRequested;
} }
- (instancetype)init - (instancetype)initWithCocoaWindow:(QCocoaWindow *)platformWindow
{ {
if ((self = [super initWithFrame:NSZeroRect])) { if ((self = [super initWithFrame:NSZeroRect])) {
m_platformWindow = platformWindow;
m_buttons = Qt::NoButton; m_buttons = Qt::NoButton;
m_acceptedMouseDowns = Qt::NoButton; m_acceptedMouseDowns = Qt::NoButton;
m_frameStrutButtons = Qt::NoButton; m_frameStrutButtons = Qt::NoButton;
@ -153,7 +154,6 @@
m_shouldSetGLContextinDrawRect = false; m_shouldSetGLContextinDrawRect = false;
#endif #endif
currentCustomDragTypes = nullptr; currentCustomDragTypes = nullptr;
m_dontOverrideCtrlLMB = false;
m_sendUpAsRightButton = false; m_sendUpAsRightButton = false;
m_inputSource = nil; m_inputSource = nil;
m_mouseMoveHelper = [[QT_MANGLE_NAMESPACE(QNSViewMouseMoveHelper) alloc] initWithView:self]; m_mouseMoveHelper = [[QT_MANGLE_NAMESPACE(QNSViewMouseMoveHelper) alloc] initWithView:self];
@ -161,36 +161,14 @@
m_scrolling = false; m_scrolling = false;
m_updatingDrag = false; m_updatingDrag = false;
m_currentlyInterpretedKeyEvent = nil; m_currentlyInterpretedKeyEvent = nil;
m_updateRequested = false;
m_dontOverrideCtrlLMB = qt_mac_resolveOption(false, platformWindow->window(),
"_q_platform_MacDontOverrideCtrlLMB", "QT_MAC_DONT_OVERRIDE_CTRL_LMB");
m_trackingArea = nil;
self.focusRingType = NSFocusRingTypeNone; self.focusRingType = NSFocusRingTypeNone;
self.cursor = nil; self.cursor = nil;
m_updateRequested = false;
}
return self;
}
- (void)dealloc
{
if (m_trackingArea) {
[self removeTrackingArea:m_trackingArea];
[m_trackingArea release];
}
[m_inputSource release];
[[NSNotificationCenter defaultCenter] removeObserver:self];
[m_mouseMoveHelper release];
delete currentCustomDragTypes;
[super dealloc];
}
- (instancetype)initWithCocoaWindow:(QCocoaWindow *)platformWindow
{
if ((self = [self init])) {
m_platformWindow = platformWindow;
self.wantsLayer = [self wantsLayerHelper]; self.wantsLayer = [self wantsLayerHelper];
m_sendKeyEvent = false;
m_dontOverrideCtrlLMB = qt_mac_resolveOption(false, platformWindow->window(), "_q_platform_MacDontOverrideCtrlLMB", "QT_MAC_DONT_OVERRIDE_CTRL_LMB");
m_trackingArea = nil;
// Enable high-DPI OpenGL for retina displays. Enabling has the side // Enable high-DPI OpenGL for retina displays. Enabling has the side
// effect that Cocoa will start calling glViewport(0, 0, width, height), // effect that Cocoa will start calling glViewport(0, 0, width, height),
@ -225,10 +203,24 @@
name:NSTextInputContextKeyboardSelectionDidChangeNotification name:NSTextInputContextKeyboardSelectionDidChangeNotification
object:nil]; object:nil];
} }
return self; return self;
} }
- (void)dealloc
{
if (m_trackingArea) {
[self removeTrackingArea:m_trackingArea];
[m_trackingArea release];
}
[m_inputSource release];
[[NSNotificationCenter defaultCenter] removeObserver:self];
[m_mouseMoveHelper release];
delete currentCustomDragTypes;
[super dealloc];
}
- (NSString *)description - (NSString *)description
{ {
NSMutableString *description = [NSMutableString stringWithString:[super description]]; NSMutableString *description = [NSMutableString stringWithString:[super description]];