Fixed some issues with custom close handling

nairaner · Jan 14, 2020 · 407af06 · 407af06
1 parent 9af9e43
commit 407af06
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 7 deletions.
diff --git a/src/DockContainerWidget.cpp b/src/DockContainerWidget.cpp
@@ -1726,7 +1726,6 @@ void CDockContainerWidget::closeOtherAreas(CDockAreaWidget* KeepOpenArea)
 		// We do not close areas with widgets with custom close handling
 		if (DockArea->features(BitwiseOr).testFlag(CDockWidget::CustomCloseHandling))
 		{
-			std::cout << "CDockWidget::CustomCloseHandling" << std::endl;
 			continue;
 		}
 

diff --git a/src/DockWidget.cpp b/src/DockWidget.cpp
@@ -770,6 +770,21 @@ bool CDockWidget::closeDockWidgetInternal(bool ForceClose)
 
 	if (features().testFlag(CDockWidget::DockWidgetDeleteOnClose))
     {
+		// If the dock widget is floating, then we check if we also need to
+		// delete the floating widget
+		if (isFloating())
+		{
+			CFloatingDockContainer* FloatingWidget = internal::findParent<
+					CFloatingDockContainer*>(this);
+			if (FloatingWidget->dockWidgets().count() == 1)
+			{
+				FloatingWidget->deleteLater();
+			}
+			else
+			{
+				FloatingWidget->hide();
+			}
+		}
 		deleteDockWidget();
     }
     else

diff --git a/src/FloatingDockContainer.cpp b/src/FloatingDockContainer.cpp
@@ -361,13 +361,8 @@ void CFloatingDockContainer::closeEvent(QCloseEvent *event)
 		auto TopLevelDockWidget = topLevelDockWidget();
 		if (TopLevelDockWidget && TopLevelDockWidget->features().testFlag(CDockWidget::DockWidgetDeleteOnClose))
 		{
-			if (TopLevelDockWidget->closeDockWidgetInternal())
+			if (!TopLevelDockWidget->closeDockWidgetInternal())
 			{
-				this->deleteLater();
-			}
-			else
-			{
-				event->ignore();
 				return;
 			}
 		}