mirrors/Qt-Advanced-Docking-System
1
0
Fork 0
mirror of https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System.git synced 2024-12-25 07:31:33 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System

Browse Source
This commit is contained in:
Uwe Kindler 2020-08-24 13:23:40 +02:00
commit 05ab8d2067
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/DockAreaWidget.cpp
View File

@ -962,7 +962,9 @@ QSize CDockAreaWidget::minimumSizeHint() const
void CDockAreaWidget::onDockWidgetFeaturesChanged() void CDockAreaWidget::onDockWidgetFeaturesChanged()
{ {
if (d->TitleBar) if (d->TitleBar)
{
d->updateTitleBarButtonStates(); d->updateTitleBarButtonStates();
}
} }

9
src/DockManager.cpp
View File

@ -653,14 +653,7 @@ void CDockManager::showEvent(QShowEvent *event)
for (auto FloatingWidget : d->UninitializedFloatingWidgets) for (auto FloatingWidget : d->UninitializedFloatingWidgets)
{ {
for(CDockWidget* DockWidget : FloatingWidget->dockWidgets()) FloatingWidget->show();
{
if(!DockWidget->isClosed())
{
FloatingWidget->show();
break;
}
}
} }
d->UninitializedFloatingWidgets.clear(); d->UninitializedFloatingWidgets.clear();
} }