Honor graphics system on Mac/Cocoa when exposing and resizing window

When exposing or resizing a previously hidden window on Cocoa, we would
go through the CoreGraphicsPaintEngine even when a different graphics
system was set. This was because there were two different paths from
the windowing system into our paint event. The one going through the
virtual drawRect function in QCocoaView did not honor the graphics
system. This patch makes sure the backing store is used for these types
of events as well.

Done with: Gunnar

Reviewed-by: MortenS

1 files changed, 8 insertions, 0 deletions

diff --git a/src/gui/kernel/qcocoaview_mac.mm b/src/gui/kernel/qcocoaview_mac.mm
index 4c2a14a..417d54c 100644
--- a/src/gui/kernel/qcocoaview_mac.mm
+++ b/src/gui/kernel/qcocoaview_mac.mm
@@ -51,6 +51,7 @@
 #include <private/qmacinputcontext_p.h>
 #include <private/qmultitouch_mac_p.h>
 #include <private/qevent_p.h>
+#include <private/qbackingstore_p.h>
 
 #include <qscrollarea.h>
 #include <qhash.h>
@@ -503,6 +504,13 @@ extern "C" {
 
 - (void)drawRect:(NSRect)aRect
 {
+    qDebug("drawRect");
+    if (QApplicationPrivate::graphicsSystem() != 0) {
+        if (QWidgetBackingStore *bs = qwidgetprivate->maybeBackingStore())
+            bs->markDirty(qwidget->rect(), qwidget);
+        qwidgetprivate->syncBackingStore(qwidget->rect());
+        return;
+    }
     CGContextRef cg = (CGContextRef)[[NSGraphicsContext currentContext] graphicsPort];
     qwidgetprivate->hd = cg;
     CGContextSaveGState(cg);