diff options
| author | Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com> | 2009-04-20 08:02:05 (GMT) |
|---|---|---|
| committer | Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com> | 2009-04-20 13:53:57 (GMT) |
| commit | c520a4c75d16948417f6c1a3f42508510be0b5f4 (patch) | |
| tree | 8b4854c1077d645f523a4928f2f5aafde4191ba1 /src/gui/graphicsview/qgraphicswidget.cpp | |
| parent | 9f668a352df15404234ea30bc9bb0c1ef774c1b0 (diff) | |
| download | Qt-c520a4c75d16948417f6c1a3f42508510be0b5f4.zip Qt-c520a4c75d16948417f6c1a3f42508510be0b5f4.tar.gz Qt-c520a4c75d16948417f6c1a3f42508510be0b5f4.tar.bz2 | |
Working on QGraphicsProxyWidget's handling of widget flags.
Diffstat (limited to 'src/gui/graphicsview/qgraphicswidget.cpp')
| -rw-r--r-- | src/gui/graphicsview/qgraphicswidget.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/gui/graphicsview/qgraphicswidget.cpp b/src/gui/graphicsview/qgraphicswidget.cpp index 2e7d82a..66930f2 100644 --- a/src/gui/graphicsview/qgraphicswidget.cpp +++ b/src/gui/graphicsview/qgraphicswidget.cpp @@ -1039,10 +1039,6 @@ QVariant QGraphicsWidget::itemChange(GraphicsItemChange change, const QVariant & break; } case ItemParentHasChanged: { - // reset window type on parent change in order to automagically remove decorations etc. - Qt::WindowFlags wflags = d->windowFlags & ~Qt::WindowType_Mask; - d->adjustWindowFlags(&wflags); - setWindowFlags(wflags); // Deliver ParentChange. QEvent event(QEvent::ParentChange); QApplication::sendEvent(this, &event); @@ -1623,6 +1619,7 @@ void QGraphicsWidget::setWindowFlags(Qt::WindowFlags wFlags) return; bool wasPopup = (d->windowFlags & Qt::WindowType_Mask) == Qt::Popup; + d->adjustWindowFlags(&wFlags); d->windowFlags = wFlags; if (!d->setWindowFrameMargins) unsetWindowFrameMargins(); |