From 13714cdd64d96b0c37c8120143c03436900c256d Mon Sep 17 00:00:00 2001 From: Debao Zhang Date: Fri, 1 Jun 2012 04:10:16 -0700 Subject: Fix parent-children relationship of QWidgetWindows For a native child widget, widget->nativeParentWidget()->windowHandle() should always equal to widget->windowHandle()->parent() Change-Id: I2560689d32b0cb2834ed33f96c1c70ef3c14342d Reviewed-by: Miikka Heikkinen Reviewed-by: Laszlo Agocs Reviewed-by: Girish Ramakrishnan --- src/widgets/kernel/qwidget_qpa.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/widgets/kernel/qwidget_qpa.cpp') diff --git a/src/widgets/kernel/qwidget_qpa.cpp b/src/widgets/kernel/qwidget_qpa.cpp index bf5a8df7c0..355af1740e 100644 --- a/src/widgets/kernel/qwidget_qpa.cpp +++ b/src/widgets/kernel/qwidget_qpa.cpp @@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE -void q_createNativeChildrenAndSetParent(QWindow *parentWindow, const QWidget *parentWidget) +void q_createNativeChildrenAndSetParent(const QWidget *parentWidget) { QObjectList children = parentWidget->children(); for (int i = 0; i < children.size(); i++) { @@ -70,13 +70,14 @@ void q_createNativeChildrenAndSetParent(QWindow *parentWindow, const QWidget *pa if (!childWidget->windowHandle()) childWidget->winId(); if (childWidget->windowHandle()) { - if (childWidget->isTopLevel()) + QWindow *parentWindow = childWidget->nativeParentWidget()->windowHandle(); + if (childWidget->isWindow()) childWidget->windowHandle()->setTransientParent(parentWindow); else childWidget->windowHandle()->setParent(parentWindow); } } else { - q_createNativeChildrenAndSetParent(parentWindow,childWidget); + q_createNativeChildrenAndSetParent(childWidget); } } } @@ -147,7 +148,7 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO setWinId(win->winId()); // Check children and create windows for them if necessary - q_createNativeChildrenAndSetParent(q->windowHandle(), q); + q_createNativeChildrenAndSetParent(q); // If widget is already shown, set window visible, too if (q->isVisible()) -- cgit v1.2.3