AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QCococaWindow: Add NSView hosting support.

Browse Source 
Add and export QCCoocaView::setContentView(NSView *),
making it possible to host a foreign NSView in a QWindow.

Change QCoocaWindow::m_contentView to be a generic
NSView, instead of a QNSView. Add a separate m_qtView
for code paths that expect a QNSView.

Change-Id: I47935b69705c70ea7efbb03d6d4bf489947c3487
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
This commit is contained in:
Morten Johan Sørvig 2013-01-08 13:45:37 +01:00 committed by The Qt Project
parent d7dfab8cac
commit d9b04f8575
5 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/platforms/cocoa/qcocoabackingstore.mm
View File

@ -91,7 +91,7 @@ void QCocoaBackingStore::flush(QWindow *win, const QRegion &region, const QPoint
CGImageRelease(m_cgImage); CGImageRelease(m_cgImage);
m_cgImage = 0; m_cgImage = 0;
if (QCocoaWindow *cocoaWindow = static_cast<QCocoaWindow *>(win->handle())) if (QCocoaWindow *cocoaWindow = static_cast<QCocoaWindow *>(win->handle()))
[cocoaWindow->m_contentView flushBackingStore:this region:region offset:offset]; [cocoaWindow->m_qtView flushBackingStore:this region:region offset:offset];
} }
void QCocoaBackingStore::resize(const QSize &size, const QRegion &) void QCocoaBackingStore::resize(const QSize &size, const QRegion &)

3
src/plugins/platforms/cocoa/qcocoanativeinterface.h
View File

@ -102,6 +102,9 @@ private:
// QImage <-> CGImage conversion functions // QImage <-> CGImage conversion functions
static CGImageRef qImageToCGImage(const QImage &image); static CGImageRef qImageToCGImage(const QImage &image);
static QImage cgImageToQImage(CGImageRef image); static QImage cgImageToQImage(CGImageRef image);
// Embedding NSViews as child QWindows
static void setWindowContentView(QPlatformWindow *window, void *nsViewContentView);
}; };
#endif // QCOCOANATIVEINTERFACE_H #endif // QCOCOANATIVEINTERFACE_H

7
src/plugins/platforms/cocoa/qcocoanativeinterface.mm
View File

@ -113,6 +113,8 @@ QPlatformNativeInterface::NativeResourceForIntegrationFunction QCocoaNativeInter
return NativeResourceForIntegrationFunction(QCocoaNativeInterface::qImageToCGImage); return NativeResourceForIntegrationFunction(QCocoaNativeInterface::qImageToCGImage);
if (resource.toLower() == "cgimagetoqimage") if (resource.toLower() == "cgimagetoqimage")
return NativeResourceForIntegrationFunction(QCocoaNativeInterface::cgImageToQImage); return NativeResourceForIntegrationFunction(QCocoaNativeInterface::cgImageToQImage);
if (resource.toLower() == "setwindowcontentview")
return NativeResourceForIntegrationFunction(QCocoaNativeInterface::setWindowContentView);
return 0; return 0;
} }
@ -198,5 +200,10 @@ QImage QCocoaNativeInterface::cgImageToQImage(CGImageRef image)
return qt_mac_toQImage(image); return qt_mac_toQImage(image);
} }
void QCocoaNativeInterface::setWindowContentView(QPlatformWindow *window, void *contentView)
{
QCocoaWindow *cocoaPlatformWindow = static_cast<QCocoaWindow *>(window);
cocoaPlatformWindow->setContentView(reinterpret_cast<NSView *>(contentView));
}
QT_END_NAMESPACE QT_END_NAMESPACE

4
src/plugins/platforms/cocoa/qcocoawindow.h
View File

@ -119,6 +119,7 @@ public:
void setParent(const QPlatformWindow *window); void setParent(const QPlatformWindow *window);
NSView *contentView() const; NSView *contentView() const;
void setContentView(NSView *contentView);
void windowWillMove(); void windowWillMove();
void windowDidMove(); void windowDidMove();
@ -160,7 +161,8 @@ public: // for QNSView
friend class QCocoaBackingStore; friend class QCocoaBackingStore;
friend class QCocoaNativeInterface; friend class QCocoaNativeInterface;
QNSView *m_contentView; NSView *m_contentView;
QNSView *m_qtView;
NSWindow *m_nsWindow; NSWindow *m_nsWindow;
bool m_contentViewIsEmbedded; // true if the m_contentView is embedded in a "foregin" NSView hiearchy bool m_contentViewIsEmbedded; // true if the m_contentView is embedded in a "foregin" NSView hiearchy

22
src/plugins/platforms/cocoa/qcocoawindow.mm
View File

@ -201,7 +201,8 @@ QCocoaWindow::QCocoaWindow(QWindow *tlw)
#endif #endif
QCocoaAutoReleasePool pool; QCocoaAutoReleasePool pool;
m_contentView = [[QNSView alloc] initWithQWindow:tlw platformWindow:this]; m_qtView = [[QNSView alloc] initWithQWindow:tlw platformWindow:this];
m_contentView = m_qtView;
setGeometry(tlw->geometry()); setGeometry(tlw->geometry());
recreateWindow(parent()); recreateWindow(parent());
@ -534,7 +535,7 @@ void QCocoaWindow::setMask(const QRegion &region)
[m_nsWindow setBackgroundColor:[NSColor clearColor]]; [m_nsWindow setBackgroundColor:[NSColor clearColor]];
} }
[m_contentView setMaskRegion:&region]; [m_qtView setMaskRegion:&region];
} }
bool QCocoaWindow::setKeyboardGrabEnabled(bool grab) bool QCocoaWindow::setKeyboardGrabEnabled(bool grab)
@ -578,6 +579,19 @@ NSView *QCocoaWindow::contentView() const
return m_contentView; return m_contentView;
} }
void QCocoaWindow::setContentView(NSView *contentView)
{
// Remove and release the previous content view
[m_contentView removeFromSuperview];
[m_contentView release];
// Insert and retain the new content view
[contentView retain];
m_contentView = contentView;
m_qtView = 0; // The new content view is not a QNSView.
recreateWindow(parent()); // Adds the content view to parent NSView
}
void QCocoaWindow::windowWillMove() void QCocoaWindow::windowWillMove()
{ {
// Close any open popups on window move // Close any open popups on window move
@ -590,7 +604,7 @@ void QCocoaWindow::windowWillMove()
void QCocoaWindow::windowDidMove() void QCocoaWindow::windowDidMove()
{ {
[m_contentView updateGeometry]; [m_qtView updateGeometry];
} }
void QCocoaWindow::windowDidResize() void QCocoaWindow::windowDidResize()
@ -598,7 +612,7 @@ void QCocoaWindow::windowDidResize()
if (!m_nsWindow) if (!m_nsWindow)
return; return;
[m_contentView updateGeometry]; [m_qtView updateGeometry];
} }
void QCocoaWindow::windowWillClose() void QCocoaWindow::windowWillClose()