AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix parent-children relationship of QWidgetWindows

Browse Source 
For a native child widget,
widget->nativeParentWidget()->windowHandle()
should always equal to
widget->windowHandle()->parent()

Change-Id: I2560689d32b0cb2834ed33f96c1c70ef3c14342d
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
This commit is contained in:
Debao Zhang 2012-06-01 04:10:16 -07:00 committed by Qt by Nokia
parent f7c2ba9bbe
commit 13714cdd64
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/widgets/kernel/qwidget_qpa.cpp
View File

@ -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())