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

macOS: Don't try to cast foreign windows to QNSView

Browse Source 
Change-Id: I08a4d76310a689c3c855d4c8306f9d7aa5cecadc
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
This commit is contained in:
Tor Arne Vestbø 2017-01-30 20:26:58 +01:00 committed by Timur Pocheptsov
parent 0b18d51b89
commit b5068a2831
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/platforms/cocoa/qcocoaglcontext.mm
View File

@ -255,7 +255,8 @@ void QCocoaGLContext::setActiveWindow(QWindow *window)
QCocoaWindow *cocoaWindow = static_cast<QCocoaWindow *>(window->handle()); QCocoaWindow *cocoaWindow = static_cast<QCocoaWindow *>(window->handle());
cocoaWindow->setCurrentContext(this); cocoaWindow->setCurrentContext(this);
[(QNSView *) cocoaWindow->view() setQCocoaGLContext:this]; Q_ASSERT(!cocoaWindow->isForeignWindow());
[qnsview_cast(cocoaWindow->view()) setQCocoaGLContext:this];
} }
void QCocoaGLContext::updateSurfaceFormat() void QCocoaGLContext::updateSurfaceFormat()

4
src/plugins/platforms/cocoa/qcocoamenu.mm
View File

@ -581,8 +581,8 @@ void QCocoaMenu::showPopup(const QWindow *parentWindow, const QRect &targetRect,
// The calls above block, and also swallow any mouse release event, // The calls above block, and also swallow any mouse release event,
// so we need to clear any mouse button that triggered the menu popup. // so we need to clear any mouse button that triggered the menu popup.
if ([view isKindOfClass:[QNSView class]]) if (!cocoaWindow->isForeignWindow())
[(QNSView *)view resetMouseButtons]; [qnsview_cast(view) resetMouseButtons];
} }
void QCocoaMenu::dismiss() void QCocoaMenu::dismiss()