whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QMainWindowLayout::unplug(): Prevent unplugging when the widget is not a window. 

Task-number: QTBUG-50490
Change-Id: Icf02e2316bbad0794bd5ac6dccd857bfb28a498b
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
bb10
Friedemann Kleint 2016-01-19 13:18:35 +01:00 committed by Olivier Goffart (Woboq GmbH)
parent 8dad3bf212
commit 191858abe8
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/widgets/widgets/qmainwindowlayout.cpp
View File

@ -2252,17 +2252,18 @@ void QMainWindowLayout::setCentralWidget(QWidget *widget)
QLayoutItem *QMainWindowLayout::unplug(QWidget *widget, bool group)
{
#if !defined(QT_NO_DOCKWIDGET) && !defined(QT_NO_TABBAR)
QDockWidgetGroupWindow *floatingParent = qobject_cast<QDockWidgetGroupWindow *>(widget->parentWidget());
if (group && floatingParent && !widget->isWindow()) {
// We are just dragging a floating window as it, not need to do anything, we just have to
// look up the corresponding QWidgetItem* if it exists
QList<int> tabbedWindowPath = layoutState.indexOf(widget->parentWidget());
return tabbedWindowPath.isEmpty() ? 0 : layoutState.item(tabbedWindowPath);
} else if (floatingParent) {
// We are unplugging a dock widget from a floating window.
if (QDockWidget *dw = qobject_cast<QDockWidget*>(widget)) {
dw->d_func()->unplug(widget->geometry());
return 0;
if (!widget->isWindow() && qobject_cast<const QDockWidgetGroupWindow *>(widget->parentWidget())) {
if (group) {
// We are just dragging a floating window as it, not need to do anything, we just have to
// look up the corresponding QWidgetItem* if it exists
QList<int> tabbedWindowPath = layoutState.indexOf(widget->parentWidget());
return tabbedWindowPath.isEmpty() ? 0 : layoutState.item(tabbedWindowPath);
} else {
// We are unplugging a dock widget from a floating window.
if (QDockWidget *dw = qobject_cast<QDockWidget*>(widget)) {
dw->d_func()->unplug(widget->geometry());
return 0;
}
}
}
#endif