1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't show bogus empty window when calling QMainWindow::restoreState()

Browse Source 
Qt doesn't create the actual QDockWidgets when restoring, the user must
ensure they are created before restoring state. So lets not create an empty
QDockWidgetGroupWindow which you can't close and with no tabs.

Change-Id: If0a6aa7cf6f3932ff4274e03f787e27aef8fa53d
Task-Id: QTBUG-57492
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
This commit is contained in:
Sergio Martins 2016-12-07 12:28:05 +00:00 committed by Sérgio Martins
parent 64666b9ee0
commit 461549c35a
3 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/widgets/widgets/qdockarealayout.cpp
View File

@ -266,6 +266,16 @@ bool QDockAreaLayoutInfo::isEmpty() const
return next(-1) == -1; return next(-1) == -1;
} }
bool QDockAreaLayoutInfo::onlyHasPlaceholders() const
{
for (const QDockAreaLayoutItem &item : item_list) {
if (!item.placeHolderItem)
return false;
}
return true;
}
QSize QDockAreaLayoutInfo::minimumSize() const QSize QDockAreaLayoutInfo::minimumSize() const
{ {
if (isEmpty()) if (isEmpty())

1
src/widgets/widgets/qdockarealayout_p.h
View File

@ -167,6 +167,7 @@ public:
void clear(); void clear();
bool isEmpty() const; bool isEmpty() const;
bool onlyHasPlaceholders() const;
bool hasFixedSize() const; bool hasFixedSize() const;
QList<int> findSeparator(const QPoint &pos) const; QList<int> findSeparator(const QPoint &pos) const;
int next(int idx) const; int next(int idx) const;

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

@ -1030,11 +1030,18 @@ bool QMainWindowLayoutState::restoreState(QDataStream &_stream,
Qt::Horizontal, QTabBar::RoundedSouth, mainWindow); Qt::Horizontal, QTabBar::RoundedSouth, mainWindow);
QRect geometry; QRect geometry;
stream >> geometry; stream >> geometry;
if (!floatingTab->layoutInfo()->restoreState(stream, dockWidgets, false)) QDockAreaLayoutInfo *info = floatingTab->layoutInfo();
if (!info->restoreState(stream, dockWidgets, false))
return false; return false;
geometry = QDockAreaLayout::constrainedRect(geometry, floatingTab); geometry = QDockAreaLayout::constrainedRect(geometry, floatingTab);
floatingTab->move(geometry.topLeft()); floatingTab->move(geometry.topLeft());
floatingTab->resize(geometry.size()); floatingTab->resize(geometry.size());
// Don't show an empty QDockWidgetGroupWindow if no dock widget is available yet.
// reparentWidgets() would be triggered by show(), so do it explicitly here.
if (info->onlyHasPlaceholders())
info->reparentWidgets(floatingTab);
else
floatingTab->show(); floatingTab->show();
} }
break; break;