From 799e7456268e347356cf4949fcab525968e9fea2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B8rgen=20Lind?= <jorgen.lind@nokia.com>
Date: Tue, 16 Nov 2010 10:51:28 +0100
Subject: Lighthouse: Make sure that we call QPlatformWindow::setVisible

on native child widgets.

Reviewed-by: paul
---
 src/gui/kernel/qwidget_qpa.cpp                     | 35 ++++++++++------------
 src/plugins/platforms/testlite/qtestlitewindow.cpp |  1 -
 2 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/src/gui/kernel/qwidget_qpa.cpp b/src/gui/kernel/qwidget_qpa.cpp
index aff959e..acb2615 100644
--- a/src/gui/kernel/qwidget_qpa.cpp
+++ b/src/gui/kernel/qwidget_qpa.cpp
@@ -392,25 +392,22 @@ void QWidgetPrivate::show_sys()
 
     QPlatformWindow *window = q->platformWindow();
     if (window) {
-         const QRect geomRect = q->geometry();
-         const QRect windowRect = window->geometry();
-         if (windowRect != geomRect) {
-             window->setGeometry(geomRect);
-         }
-         if (q->isWindow()) {
-             if (QWindowSurface *surface = q->windowSurface()) {
-                 if (windowRect.size() != geomRect.size()) {
-                     surface->resize(geomRect.size());
-                 }
-             }
-
-             if (window)
-                 window->setVisible(true);
-
-             if (q->windowType() != Qt::Popup && q->windowType() != Qt::ToolTip && !(q->windowFlags() & Qt::X11BypassWindowManagerHint))
-                 q->activateWindow(); //###
-         }
-     }
+        const QRect geomRect = q->geometry();
+        const QRect windowRect = window->geometry();
+        if (windowRect != geomRect) {
+            window->setGeometry(geomRect);
+        }
+        if (QWindowSurface *surface = q->windowSurface()) {
+            if (windowRect.size() != geomRect.size()) {
+                surface->resize(geomRect.size());
+            }
+        }
+        if (window)
+            window->setVisible(true);
+
+        if (q->isWindow() && q->windowType() != Qt::Popup && q->windowType() != Qt::ToolTip && !(q->windowFlags() & Qt::X11BypassWindowManagerHint))
+            q->activateWindow(); //### QWindowSystemInterface should have callback function for when WS actually activates window.
+    }
 }
 
 
diff --git a/src/plugins/platforms/testlite/qtestlitewindow.cpp b/src/plugins/platforms/testlite/qtestlitewindow.cpp
index 1de4b9d..9f3c435 100644
--- a/src/plugins/platforms/testlite/qtestlitewindow.cpp
+++ b/src/plugins/platforms/testlite/qtestlitewindow.cpp
@@ -649,7 +649,6 @@ void QTestLiteWindow::setParent(const QPlatformWindow *window)
 {
         QPoint point = widget()->mapTo(widget()->nativeParentWidget(),QPoint());
         XReparentWindow(xd->display,x_window,window->winId(),point.x(),point.y());
-        XMapWindow(xd->display, x_window);
 }
 
 void QTestLiteWindow::raise()
-- 
cgit v0.12