From 0a4440ae092058fd1fd4cd8df3908bc8d3cabfee Mon Sep 17 00:00:00 2001
From: Gareth Stockwell <gareth.stockwell@sosco.com>
Date: Mon, 28 Sep 2009 16:51:57 +0100
Subject: Removed calls to CCoeControl::DrawNow from
 QWidgetPrivate::setWSGeometry

---
 src/gui/kernel/qwidget_s60.cpp | 37 +++++++------------------------------
 1 file changed, 7 insertions(+), 30 deletions(-)

diff --git a/src/gui/kernel/qwidget_s60.cpp b/src/gui/kernel/qwidget_s60.cpp
index 912ba1f..d69a5d0 100644
--- a/src/gui/kernel/qwidget_s60.cpp
+++ b/src/gui/kernel/qwidget_s60.cpp
@@ -150,7 +150,6 @@ void QWidgetPrivate::setWSGeometry(bool dontShow, const QRect &)
 #endif
 
                     data.winid->SetExtent(TPoint(xrect.x(), xrect.y()), TSize(xrect.width(), xrect.height()));
-                    data.winid->DrawNow();
                 }
                 return;
             }
@@ -242,26 +241,17 @@ void QWidgetPrivate::setWSGeometry(bool dontShow, const QRect &)
         }
     }
 
-    //to avoid flicker, we have to show children after the helper widget has moved
-    if (jump) {
-        for (int i = 0; i < children.size(); ++i) {
-            QObject *object = children.at(i);
-            if (object->isWidgetType()) {
-                QWidget *w = static_cast<QWidget *>(object);
-                if (!w->testAttribute(Qt::WA_OutsideWSRange) && !w->testAttribute(Qt::WA_Mapped) && !w->isHidden()) {
-                    w->setAttribute(Qt::WA_Mapped);
-                    if (w->internalWinId()) {
+    if (mapWindow and !dontShow) {
+        q->setAttribute(Qt::WA_Mapped);
+        if (q->internalWinId()) {
 
 #ifdef DEBUG_QWIDGET
-    qDebug()    << "QWidgetPrivate::setWSGeometry [" << this << "] (6)"
+    qDebug()    << "QWidgetPrivate::setWSGeometry [" << this << "] (8)"
                 << "control" << data.winid
                 << "SetVisible(ETrue)";
 #endif
 
-                        w->data->winid->DrawableWindow()->SetVisible(ETrue);
-                    }
-                }
-            }
+            q->internalWinId()->DrawableWindow()->SetVisible(ETrue);
         }
     }
 
@@ -273,21 +263,8 @@ void QWidgetPrivate::setWSGeometry(bool dontShow, const QRect &)
                 << "DrawNow" << wrect.width() << 'x' << wrect.height();
 #endif
 
-        data.winid->DrawNow(TRect(0, 0, wrect.width(), wrect.height()));
-    }
-
-    if (mapWindow and !dontShow) {
-        q->setAttribute(Qt::WA_Mapped);
-        if (q->internalWinId()) {
-
-#ifdef DEBUG_QWIDGET
-    qDebug()    << "QWidgetPrivate::setWSGeometry [" << this << "] (8)"
-                << "control" << data.winid
-                << "SetVisible(ETrue)";
-#endif
-
-            q->internalWinId()->DrawableWindow()->SetVisible(ETrue);
-        }
+        RWindow *const window = static_cast<RWindow *>(data.winid->DrawableWindow());
+        window->Invalidate(TRect(0, 0, wrect.width(), wrect.height()));
     }
 }
 
-- 
cgit v0.12