diff options
| author | Morten Sorvig <morten.sorvig@nokia.com> | 2012-05-25 11:36:03 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-06 07:41:14 +0200 |
| commit | 09001e72dc527cb50d84c15d7afdfb4b4116c883 (patch) | |
| tree | 977cc190ca515de3a7c8b22583a571b4487c780d | |
| parent | 4951d1611021e6ffd29fe33918c7c0ebd0a17844 (diff) | |
Cocoa: Fix QCocoaBackingStore::flush on 10.8
The call to displayRect works on 10.7 but does not
update the pixels on screen on 10.8. Many Qt windows
do not update properly.
This is a workaround found by trail and error
without fully understanding the underlying issue.
I would like to have this in place until we can
determine the cause of the bug.
Change-Id: I1ecee745f42a93ded4f651cc8ad51963f250e78d
Reviewed-by: Christoph Schleifenbaum <christoph.schleifenbaum@kdab.com>
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoabackingstore.mm | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoabackingstore.mm b/src/plugins/platforms/cocoa/qcocoabackingstore.mm index 660c2b651f..44243d379d 100644 --- a/src/plugins/platforms/cocoa/qcocoabackingstore.mm +++ b/src/plugins/platforms/cocoa/qcocoabackingstore.mm @@ -72,8 +72,18 @@ void QCocoaBackingStore::flush(QWindow *widget, const QRegion ®ion, const QPo QRect geo = region.boundingRect(); NSRect rect = NSMakeRect(geo.x(), geo.y(), geo.width(), geo.height()); QCocoaWindow *cocoaWindow = static_cast<QCocoaWindow *>(window()->handle()); - if (cocoaWindow) + if (cocoaWindow) { + +#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_8 + if (QSysInfo::QSysInfo::MacintoshVersion >= QSysInfo::MV_10_8) { + // Workaround for malfunctioning displayRect on 10.8 where + // calling it seems to have no effect. Call setImage like + // resize() does. + [cocoaWindow->m_contentView setImage:m_image]; + } +#endif [cocoaWindow->m_contentView displayRect:rect]; + } } void QCocoaBackingStore::resize(const QSize &size, const QRegion &) |