From bc6c569b0d5862a159394de831cd129b610715ad Mon Sep 17 00:00:00 2001
From: Anders Bakken <anders.bakken@nokia.com>
Date: Mon, 17 Aug 2009 13:21:38 -0700
Subject: Fix a bug in wrt DFBWindowSurface's paintEngine

Make sure we recreate the paint engine if it's 0 in beginPaint. Also
don't delete the paint engine in moves, only resizes.

Reviewed-by: Donald <qt-info@nokia.com>
---
 .../gfxdrivers/directfb/qdirectfbwindowsurface.cpp      | 17 ++++++-----------
 .../gfxdrivers/directfb/qdirectfbwindowsurface.h        |  1 -
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp
index d837509..57894d5 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp
@@ -55,7 +55,6 @@ QDirectFBWindowSurface::QDirectFBWindowSurface(DFBSurfaceFlipFlags flip, QDirect
 #ifndef QT_NO_DIRECTFB_WM
     , dfbWindow(0)
 #endif
-    , engineHeight(-1)
     , flipFlags(flip)
     , boundingRectFlip(scr->directFBFlags() & QDirectFBScreen::BoundingRectFlip)
 {
@@ -76,7 +75,6 @@ QDirectFBWindowSurface::QDirectFBWindowSurface(DFBSurfaceFlipFlags flip, QDirect
 #ifndef QT_NO_DIRECTFB_WM
     , dfbWindow(0)
 #endif
-    , engineHeight(-1)
     , flipFlags(flip)
     , boundingRectFlip(scr->directFBFlags() & QDirectFBScreen::BoundingRectFlip)
 {
@@ -223,13 +221,14 @@ void QDirectFBWindowSurface::setGeometry(const QRect &rect)
             break; }
         }
 
+        if (size() != geometry().size()) {
+            delete engine;
+            engine = 0;
+        }
+
         if (result != DFB_OK)
             DirectFBErrorFatal("QDirectFBWindowSurface::setGeometry()", result);
     }
-    if (engine) {
-        delete engine;
-        engine = 0;
-    }
     QWSWindowSurface::setGeometry(rect);
 }
 
@@ -419,12 +418,8 @@ void QDirectFBWindowSurface::flush(QWidget *, const QRegion &region,
 
 void QDirectFBWindowSurface::beginPaint(const QRegion &)
 {
-    const int h = height();
-    if (h > engineHeight) {
-        engineHeight = h;
-        delete engine;
+    if (!engine)
         engine = new QDirectFBPaintEngine(this);
-    }
 }
 
 void QDirectFBWindowSurface::endPaint(const QRegion &)
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.h b/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.h
index 0d6ebc0..396cc32 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.h
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.h
@@ -91,7 +91,6 @@ private:
     void createWindow();
     IDirectFBWindow *dfbWindow;
 #endif
-    int engineHeight;
 
     enum Mode {
         Primary,
-- 
cgit v0.12