Scarfski/Qt-Advanced-Docking-System
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed showing and hiding of dock widget title bar. If a dock widget is the one and only visible widget in a FloatingDockContainer, then this widget does not have a tile bar because the window already has a window frame that provides the same functionality

Browse Source
This commit is contained in:
Uwe Kindler
2018-09-14 13:21:29 +02:00
parent 6ec38b48ef
commit 9f1b2c122a
6 changed files with 139 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/DockAreaWidget.cpp
View File

@@ -216,14 +216,7 @@ void DockAreaWidgetPrivate::updateTabBar()
return;
}
if (Container->isFloating() && (Container->dockAreaCount() == 1) && (_this->dockWidgetsCount() == 1))
{
TitleBar->setVisible(false);
}
else
{
TitleBar->setVisible(true);
}
TitleBar->setVisible(!Container->isFloating() || !Container->hasSingleVisibleDockWidget());
}
@@ -360,27 +353,25 @@ void CDockAreaWidget::insertDockWidget(int index, CDockWidget* DockWidget,
void CDockAreaWidget::removeDockWidget(CDockWidget* DockWidget)
{
qDebug() << "CDockAreaWidget::removeDockWidget";
auto NextDockWidget = nextOpenDockWidget(DockWidget);
auto NextOpenDockWidget = nextOpenDockWidget(DockWidget);
d->ContentsLayout->removeWidget(DockWidget);
auto TitleBar = DockWidget->tabWidget();
TitleBar->hide();
d->TabsLayout->removeWidget(TitleBar);
disconnect(TitleBar, SIGNAL(clicked()), this, SLOT(onDockWidgetTitleClicked()));
if (NextDockWidget)
auto TabWidget = DockWidget->tabWidget();
TabWidget->hide();
d->TabsLayout->removeWidget(TabWidget);
disconnect(TabWidget, SIGNAL(clicked()), this, SLOT(onDockWidgetTitleClicked()));
if (NextOpenDockWidget)
{
setCurrentDockWidget(NextDockWidget);
setCurrentDockWidget(NextOpenDockWidget);
d->markTabsMenuOutdated();
}
CDockContainerWidget* DockContainer = dockContainer();
if (d->ContentsLayout->isEmpty())
else if (d->ContentsLayout->isEmpty())
{
qDebug() << "Dock Area empty";
dockContainer()->removeDockArea(this);
this->deleteLater();;
this->deleteLater();
}
else if (!NextDockWidget)
else
{
// if contents layout is not empty but there are no more open dock
// widgets, then we need to hide the dock area because it does not
@@ -390,7 +381,11 @@ void CDockAreaWidget::removeDockWidget(CDockWidget* DockWidget)
d->updateTabBar();
DockWidget->setDockArea(nullptr);
#if (ADS_DEBUG_LEVEL > 0)
CDockContainerWidget* DockContainer = dockContainer();
DockContainer->dumpLayout();
#endif
}
@@ -656,6 +651,7 @@ void CDockAreaWidget::toggleDockWidgetView(CDockWidget* DockWidget, bool Open)
{
Q_UNUSED(DockWidget);
Q_UNUSED(Open);
updateDockArea();
d->markTabsMenuOutdated();
}