Fixed handling of dock area removal in floating dock container, added close-button.svg icon to enable display of disabled close button

Author: Uwe Kindler

src/DockAreaTitleBar.cpp

@@ -93,15 +93,9 @@ void DockAreaTitleBarPrivate::createButtons()
 	CloseButton = new tTileBarButton();
 	CloseButton->setObjectName("closeButton");
 	CloseButton->setFlat(true);
-	QPixmap ClosePixmap = _this->style()->standardPixmap(QStyle::SP_TitleBarCloseButton);
-	QIcon CloseIcon;
-	QStyleOptionButton option;
-	option.initFrom(CloseButton);
-	QPixmap ClosePixmapDisabled = _this->style()->generatedIconPixmap(QIcon::Disabled, ClosePixmap, &option);
-	CloseIcon.addPixmap(ClosePixmap, QIcon::Active);
-	CloseIcon.addPixmap(ClosePixmapDisabled, QIcon::Disabled);
+	QIcon CloseIcon(":/ads/close-button.svg");
+	CloseIcon.addFile(":/ads/close-button-disabled.svg", QSize(), QIcon::Disabled);
 	CloseButton->setIcon(CloseIcon);
-	//CloseButton->setIcon(QIcon(":/ads/close.svg"));
 	CloseButton->setToolTip(QObject::tr("Close"));
 	CloseButton->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding);
 	TopLayout->addWidget(CloseButton, 0);

src/FloatingDockContainer.cpp

@@ -460,19 +460,7 @@ void CFloatingDockContainer::moveFloating()
 //============================================================================
 bool CFloatingDockContainer::isClosable() const
 {
-    auto OpenDockAreas = d->DockContainer->openedDockAreas();
-    for (auto DockArea : OpenDockAreas)
-    {
-        auto OpenDockWidgets = DockArea->openedDockWidgets();
-        for (auto DockWidget : OpenDockWidgets)
-        {
-            if (!DockWidget->features().testFlag(CDockWidget::DockWidgetClosable))
-            {
-                return false;
-            }
-        }
-    }
-    return true;
+    return d->DockContainer->features().testFlag(CDockWidget::DockWidgetClosable);
 }
 
 
@@ -482,7 +470,7 @@ void CFloatingDockContainer::onDockAreasAddedOrRemoved()
 	qDebug() << "CFloatingDockContainer::onDockAreasAddedOrRemoved()";
 	if (d->DockContainer->visibleDockAreaCount() == 1)
 	{
-		d->SingleDockArea = topLevelDockWidget()->dockAreaWidget();
+		d->SingleDockArea = d->DockContainer->openedDockAreas()[0];
 		this->setWindowTitle(d->SingleDockArea->currentDockWidget()->windowTitle());
 		connect(d->SingleDockArea, SIGNAL(currentChanged(int)), this,
 			SLOT(onDockAreaCurrentChanged(int)));

src/ads.qrc

@@ -2,5 +2,7 @@
     <qresource prefix="/ads">
         <file>stylesheets/default.css</file>
         <file>close.svg</file>
+        <file>close-button.svg</file>
+        <file>close-button-disabled.svg</file>
     </qresource>
 </RCC>