Implemented restoring of hidden floating widgets

Author: Uwe Kindler

AdvancedDockingSystem/res/stylesheets/default-windows2.css

@@ -60,7 +60,7 @@ ads--CDockWidget
 QPushButton#closeButton,
 QPushButton#tabsMenuButton
 {
-	padding: 1px;
+	padding: 2px;
 }
 
 

AdvancedDockingSystem/src/v2/DockAreaWidget.cpp

@@ -314,7 +314,7 @@ void DockAreaWidgetPrivate::createTabBar()
 	CloseButton->setToolTip(_this->tr("Close"));
 	CloseButton->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
 	TopLayout->addWidget(CloseButton, 0);
-	//connect(_closeButton, SIGNAL(clicked(bool)), this, SLOT(onCloseButtonClicked()));
+	_this->connect(CloseButton, SIGNAL(clicked()), SLOT(onCloseButtonClicked()));
 
 	TabsLayoutInitCount = TabsLayout->count();
 }
@@ -429,7 +429,6 @@ CDockContainerWidget* CDockAreaWidget::dockContainer() const
 void CDockAreaWidget::addDockWidget(CDockWidget* DockWidget)
 {
 	insertDockWidget(d->ContentsLayout->count(), DockWidget);
-
 }
 
 
@@ -441,13 +440,15 @@ void CDockAreaWidget::insertDockWidget(int index, CDockWidget* DockWidget,
 	DockWidget->titleBar()->setDockAreaWidget(this);
 	auto TitleBar = DockWidget->titleBar();
 	d->TabsLayout->insertWidget(index, TitleBar);
+	TitleBar->show();
 	connect(TitleBar, SIGNAL(clicked()), this, SLOT(onDockWidgetTitleClicked()));
 	DockWidget->setProperty(INDEX_PROPERTY, index);
 	if (Activate)
 	{
 		setCurrentIndex(index);
 	}
 	d->addTabsMenuEntry(DockWidget, index);
+	DockWidget->setDockArea(this);
 }
 
 
@@ -457,6 +458,7 @@ void CDockAreaWidget::removeDockWidget(CDockWidget* DockWidget)
 	std::cout << "CDockAreaWidget::removeDockWidget" << std::endl;
 	d->ContentsLayout->removeWidget(DockWidget);
 	auto TitleBar = DockWidget->titleBar();
+	TitleBar->hide();
 	d->TabsLayout->removeWidget(TitleBar);
 	disconnect(TitleBar, SIGNAL(clicked()), this, SLOT(onDockWidgetTitleClicked()));
 	setCurrentIndex(d->ContentsLayout->currentIndex());
@@ -470,6 +472,7 @@ void CDockAreaWidget::removeDockWidget(CDockWidget* DockWidget)
 	}
 
 	d->updateTabBar();
+	DockWidget->setDockArea(nullptr);
 }
 
 
@@ -487,6 +490,20 @@ void CDockAreaWidget::onDockWidgetTitleClicked()
 }
 
 
+//============================================================================
+void CDockAreaWidget::onCloseButtonClicked()
+{
+	currentDockWidget()->toggleView(false);
+}
+
+
+//============================================================================
+CDockWidget* CDockAreaWidget::currentDockWidget() const
+{
+	return dockWidget(currentIndex());
+}
+
+
 //============================================================================
 void CDockAreaWidget::setCurrentIndex(int index)
 {
@@ -630,8 +647,6 @@ void CDockAreaWidget::reorderDockWidget(int fromIndex, int toIndex)
 	liFrom = d->ContentsLayout->takeAt(fromIndex);
 	d->ContentsLayout->insertWidget(toIndex, liFrom->widget());
 	delete liFrom;
-
-	//Menu->removeAction()
 }
 
 

AdvancedDockingSystem/src/v2/DockAreaWidget.h

@@ -54,6 +54,7 @@ class CDockAreaWidget : public QFrame
 private slots:
 	void onDockWidgetTitleClicked();
 	void onTabsMenuActionTriggered(QAction* Action);
+	void onCloseButtonClicked();
 
 public:
 	/**
@@ -143,6 +144,11 @@ private slots:
 	 */
 	int currentIndex() const;
 
+	/**
+	 * Returns the current active dock widget
+	 */
+	CDockWidget* currentDockWidget() const;
+
 public slots:
 	/**
 	 * This sets the index position of the current tab page.

AdvancedDockingSystem/src/v2/DockContainerWidget.cpp

@@ -411,7 +411,7 @@ CDockContainerWidget::CDockContainerWidget(CDockManager* DockManager, QWidget *p
 	}
 
 	d->Layout = new QGridLayout();
-	d->Layout->setContentsMargins(0, 1, 0, 0);
+	d->Layout->setContentsMargins(0, 1, 0, 1);
 	d->Layout->setSpacing(0);
 	setLayout(d->Layout);
 }
@@ -539,6 +539,13 @@ CDockAreaWidget* CDockContainerWidget::dockAreaAt(const QPoint& GlobalPos) const
 }
 
 
+//============================================================================
+CDockAreaWidget* CDockContainerWidget::dockArea(int Index) const
+{
+	return (Index < dockAreaCount()) ? d->DockAreas[Index] : 0;
+}
+
+
 //============================================================================
 bool CDockContainerWidget::isFloating() const
 {

AdvancedDockingSystem/src/v2/DockContainerWidget.h

@@ -111,6 +111,12 @@ class CDockContainerWidget : public QFrame
 	 */
 	CDockAreaWidget* dockAreaAt(const QPoint& GlobalPos) const;
 
+	/**
+	 * Returns the dock area at the given Index or 0 if the index is out of
+	 * range
+	 */
+	CDockAreaWidget* dockArea(int Index) const;
+
 	/**
 	 * Returns the number of dock areas in this container
 	 */

AdvancedDockingSystem/src/v2/DockWidget.cpp

@@ -31,10 +31,19 @@
 #include "DockWidget.h"
 
 #include <QBoxLayout>
+#include <QAction>
+#include <QSplitter>
+#include <QStack>
+#include <QTextStream>
+
+#include <iostream>
 
 #include "DockWidgetTitleBar.h"
 #include "DockContainerWidget.h"
 #include "DockAreaWidget.h"
+#include "DockManager.h"
+#include "FloatingDockContainer.h"
+
 #include "ads_globals.h"
 
 namespace ads
@@ -50,11 +59,24 @@ struct DockWidgetPrivate
 	CDockWidgetTitleBar* TitleWidget;
 	CDockWidget::DockWidgetFeatures Features = CDockWidget::AllDockWidgetFeatures;
 	CDockManager* DockManager = nullptr;
+	CDockAreaWidget* DockArea = nullptr;
+	QAction* ToggleViewAction;
+	QString CapturedState;
 
 	/**
 	 * Private data constructor
 	 */
 	DockWidgetPrivate(CDockWidget* _public);
+
+	/**
+	 * Saves the current state into CapturedState variable
+	 */
+	void capturedState();
+
+	/**
+	 * Show dock widget
+	 */
+	void showDockWidget();
 };
 // struct DockWidgetPrivate
 
@@ -65,6 +87,75 @@ DockWidgetPrivate::DockWidgetPrivate(CDockWidget* _public) :
 
 }
 
+
+//============================================================================
+void DockWidgetPrivate::capturedState()
+{
+	QString CapturedState;
+	QTextStream stream(&CapturedState);
+	stream << (_this->isFloating() ? "F " : "D ");
+	if (_this->isFloating())
+	{
+		CFloatingDockContainer* FloatingWidget = internal::findParent<CFloatingDockContainer*>(_this);
+		QRect Rect = FloatingWidget->geometry();
+		stream << Rect.left() << " " << Rect.top() << " " << Rect.width()
+			<< " " << Rect.height();
+	}
+	else
+	{
+		QWidget* Widget = DockArea;
+		QSplitter* splitter = internal::findParent<QSplitter*>(Widget);
+		QStack<QString> SplitterData;
+		while (splitter)
+		{
+			SplitterData.push(QString("%1%2")
+				.arg((splitter->orientation() == Qt::Horizontal) ? "H" : "V")
+				.arg(splitter->indexOf(Widget)));
+			Widget = splitter;
+			splitter = internal::findParent<QSplitter*>(Widget);
+		}
+
+		QString Separator;
+		while (!SplitterData.isEmpty())
+		{
+			stream << Separator << SplitterData.pop();
+			Separator = " ";
+		}
+	}
+	this->CapturedState = CapturedState;
+	std::cout << "SerializedPosition: " << CapturedState.toStdString() << std::endl;
+}
+
+
+//============================================================================
+void DockWidgetPrivate::showDockWidget()
+{
+	QTextStream stream(&CapturedState);
+	QString DockedState;
+	stream >> DockedState;
+	if (DockedState == "F")
+	{
+		std::cout << "Restoring Floating Dock Widget" << std::endl;
+		QVector<int> v;
+		while (!stream.atEnd())
+		{
+			int Value;
+			stream >> Value;
+			v.append(Value);
+		}
+
+		if (v.count() == 4)
+		{
+			std::cout << "Rectangle Loaded" << std::endl;
+			QRect Rect(v[0], v[1], v[2], v[3]);
+			auto FloatingWidget = new CFloatingDockContainer(_this);
+			FloatingWidget->setGeometry(Rect);
+			FloatingWidget->show();
+		}
+	}
+}
+
+
 //============================================================================
 CDockWidget::CDockWidget(const QString &title, QWidget *parent) :
 	QFrame(parent),
@@ -77,11 +168,16 @@ CDockWidget::CDockWidget(const QString &title, QWidget *parent) :
 	setWindowTitle(title);
 
 	d->TitleWidget = new CDockWidgetTitleBar(this);
+	d->ToggleViewAction = new QAction(title);
+	d->ToggleViewAction->setCheckable(true);
+	connect(d->ToggleViewAction, SIGNAL(triggered(bool)), this,
+		SLOT(toggleView(bool)));
 }
 
 //============================================================================
 CDockWidget::~CDockWidget()
 {
+	std::cout << "~CDockWidget()" << std::endl;
 	delete d;
 }
 
@@ -157,6 +253,64 @@ CDockAreaWidget* CDockWidget::dockAreaWidget() const
 	return internal::findParent<CDockAreaWidget*>(this);
 }
 
+
+//============================================================================
+bool CDockWidget::isFloating() const
+{
+	return dockContainer() ? dockContainer()->isFloating() : false;
+}
+
+
+//============================================================================
+QAction* CDockWidget::toggleViewAction() const
+{
+	return d->ToggleViewAction;
+}
+
+
+//============================================================================
+void CDockWidget::toggleView(bool Open)
+{
+	if ((d->DockArea != nullptr) == Open)
+	{
+		return;
+	}
+
+	if (!Open && d->DockArea)
+	{
+		hideDockWidget(true);
+	}
+	else if (Open && !d->DockArea)
+	{
+		d->showDockWidget();
+	}
+}
+
+
+//============================================================================
+void CDockWidget::setDockArea(CDockAreaWidget* DockArea)
+{
+	d->DockArea = DockArea;
+	d->ToggleViewAction->setChecked(DockArea != nullptr);
+}
+
+
+
+//============================================================================
+void CDockWidget::hideDockWidget(bool RemoveFromDockArea)
+{
+	d->capturedState();
+	if (d->DockArea && RemoveFromDockArea)
+	{
+		d->DockArea->removeDockWidget(this);
+	}
+	this->setParent(d->DockManager);
+	this->setDockArea(nullptr);
+	// Remove title from dock area widget to prevent its deletion if dock
+	// area is deleted
+	d->TitleWidget->setParent(this);
+}
+
 } // namespace ads
 
 //---------------------------------------------------------------------------