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

Have subwindows parented properly.

Browse Source 
Reviewed-by: Samuel Rødal
This commit is contained in:
Laszlo Agocs 2011-05-27 13:38:47 +02:00
parent 0064dc7bc8
commit bb2986f165
1 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -96,6 +96,12 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO
QWindowSurface *surface = q->windowSurface();
QWindow *win = topData()->window;
// topData() ensures the extra is created but does not ensure 'window' is non-null
// in case the extra was already valid.
if (!win) {
createTLSysExtra();
win = topData()->window;
}
win->setWindowFlags(data.window_flags);
win->setGeometry(q->geometry());
@ -108,7 +114,7 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO
if (QWidget *nativeParent = q->nativeParentWidget()) {
if (nativeParent->windowHandle()) {
if (flags & Qt::Window) {
if (flags.testFlag(Qt::Window) && !flags.testFlag(Qt::SubWindow)) {
win->setTransientParent(nativeParent->windowHandle());
win->setParent(0);
} else {
@ -190,14 +196,16 @@ void QWidgetPrivate::setParent_sys(QWidget *newparent, Qt::WindowFlags f)
newparent = 0;
}
if (parent != newparent) {
bool subWinChange = f.testFlag(Qt::SubWindow) != oldFlags.testFlag(Qt::SubWindow);
if (parent != newparent || subWinChange) {
QObjectPrivate::setParent_helper(newparent); //### why does this have to be done in the _sys function???
createTLExtra();
if (q->windowHandle()) {
q->windowHandle()->setWindowFlags(f);
QWidget *parentWithWindow =
newparent ? (newparent->windowHandle() ? newparent : newparent->nativeParentWidget()) : 0;
if (parentWithWindow) {
if (f & Qt::Window) {
if (f.testFlag(Qt::Window) && !f.testFlag(Qt::SubWindow)) {
q->windowHandle()->setTransientParent(parentWithWindow->windowHandle());
q->windowHandle()->setParent(0);
} else {
@ -222,7 +230,9 @@ void QWidgetPrivate::setParent_sys(QWidget *newparent, Qt::WindowFlags f)
bool explicitlyHidden = q->testAttribute(Qt::WA_WState_Hidden) && q->testAttribute(Qt::WA_WState_ExplicitShowHide);
// Reparenting toplevel to child
if (!(f&Qt::Window) && (oldFlags&Qt::Window) && !q->testAttribute(Qt::WA_NativeWindow)) {
bool changedFromWin = !f.testFlag(Qt::Window) && oldFlags.testFlag(Qt::Window);
bool changedToSubWin = subWinChange && f.testFlag(Qt::SubWindow);
if ((changedFromWin || changedToSubWin) && !q->testAttribute(Qt::WA_NativeWindow)) {
//qDebug() << "setParent_sys() change from toplevel";
q->destroy();
}
@ -250,24 +260,26 @@ void QWidgetPrivate::setParent_sys(QWidget *newparent, Qt::WindowFlags f)
QPoint QWidget::mapToGlobal(const QPoint &pos) const
{
int x=pos.x(), y=pos.y();
const QWidget* w = this;
int x = pos.x();
int y = pos.y();
const QWidget *w = this;
while (w) {
x += w->data->crect.x();
y += w->data->crect.y();
w = w->isWindow() ? 0 : w->parentWidget();
w = w->parentWidget();
}
return QPoint(x, y);
}
QPoint QWidget::mapFromGlobal(const QPoint &pos) const
{
int x=pos.x(), y=pos.y();
const QWidget* w = this;
int x = pos.x();
int y = pos.y();
const QWidget *w = this;
while (w) {
x -= w->data->crect.x();
y -= w->data->crect.y();
w = w->isWindow() ? 0 : w->parentWidget();
w = w->parentWidget();
}
return QPoint(x, y);
}