Experimental implementation of close request

Author: githubuser0xFFFF

src/DockAreaWidget.cpp

@@ -494,7 +494,8 @@ void CDockAreaWidget::onTabCloseRequested(int Index)
     auto* DockWidget = dockWidget(Index);
     if (DockWidget->features().testFlag(CDockWidget::DockWidgetDeleteOnClose))
     {
-    	DockWidget->deleteDockWidget();
+    	//DockWidget->deleteDockWidget();
+    	DockWidget->closeDockWidget();
     }
     else
     {

src/DockWidget.cpp

@@ -31,6 +31,8 @@
 #include "DockWidgetTab.h"
 #include "DockWidget.h"
 
+#include <iostream>
+
 #include <QBoxLayout>
 #include <QAction>
 #include <QSplitter>
@@ -745,6 +747,42 @@ void CDockWidget::deleteDockWidget()
 }
 
 
+//============================================================================
+bool CDockWidget::handleCloseRequest()
+{
+	std::cout << "CDockWidget::handleCloseRequest()" << std::endl;
+	return true;
+}
+
+
+//============================================================================
+void CDockWidget::closeDockWidget()
+{
+	closeDockWidgetInternal();
+}
+
+
+//============================================================================
+bool CDockWidget::closeDockWidgetInternal()
+{
+	if (features().testFlag(CDockWidget::DockWidgetDeleteOnClose))
+    {
+		if (handleCloseRequest())
+		{
+			deleteDockWidget();
+			return true;
+		}
+    }
+    else
+    {
+    	toggleView(false);
+    	return true;
+    }
+
+	return false;
+}
+
+
 } // namespace ads
 
 //---------------------------------------------------------------------------

src/DockWidget.h

@@ -135,6 +135,12 @@ private slots:
 	 */
 	void toggleViewInternal(bool Open);
 
+	/**
+	 * Internal close dock widget implementation.
+	 * The function returns true if the dock widget has been closed or hidden
+	 */
+	bool closeDockWidgetInternal();
+
 public:
 	using Super = QFrame;
 
@@ -426,6 +432,12 @@ public slots:
 	 */
 	void deleteDockWidget();
 
+	/**
+	 * Closes the dock widget
+	 */
+	void closeDockWidget();
+
+
 signals:
 	/**
 	 * This signal is emitted if the dock widget is opened or closed

src/DockWidgetTab.h

@@ -133,7 +133,7 @@ private slots:
 	void setText(const QString& title);
 
 	/**
-	 * This function returns true if the assigned dock widget is closeable
+	 * This function returns true if the assigned dock widget is closable
 	 */
 	bool isClosable() const;