From bc37a2788e1998ada5726da3fdd9b16449b67c73 Mon Sep 17 00:00:00 2001
From: Uwe Kindler <uwe.kindler@cetoni.de>
Date: Tue, 11 Apr 2017 23:26:33 +0200
Subject: [PATCH] Fixed placing of drop overlay cross, resizing of floating
 widget to drop area rectangle size prior to insertion

---
 .cproject                       |    2 +
 .settings/language.settings.xml |    8 +-
 demo/main.cpp                   |   91 +--
 src/DockOverlay.cpp             | 1224 ++++++++++++++++---------------
 src/DockOverlay.h               |  322 ++++----
 src/DockSplitter.cpp            |  117 +--
 src/DockSplitter.h              |   88 +--
 src/FloatingDockContainer.cpp   |   13 +
 8 files changed, 970 insertions(+), 895 deletions(-)

diff --git a/.cproject b/.cproject
index bad5a71..8084a7c 100644
--- a/.cproject
+++ b/.cproject
@@ -34,6 +34,7 @@
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/QtAdvancedDockingSystem/demo}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${QTDIR}/include&quot;"/>
 								</option>
+								<option id="gnu.cpp.compiler.option.preprocessor.def.56223209" name="Defined symbols (-D)" superClass="gnu.cpp.compiler.option.preprocessor.def" useByScannerDiscovery="false" valueType="definedSymbols"/>
 								<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1318830536" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
 							</tool>
 							<tool id="cdt.managedbuild.tool.gnu.c.compiler.mingw.base.389117097" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.mingw.base">
@@ -42,6 +43,7 @@
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/QtAdvancedDockingSystem/src}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${QTDIR}/include&quot;"/>
 								</option>
+								<option id="gnu.c.compiler.option.preprocessor.def.symbols.806805509" name="Defined symbols (-D)" superClass="gnu.c.compiler.option.preprocessor.def.symbols" useByScannerDiscovery="false" valueType="definedSymbols"/>
 								<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1568363924" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
 							</tool>
 							<tool id="cdt.managedbuild.tool.gnu.c.linker.mingw.base.1734874312" name="MinGW C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.mingw.base"/>
diff --git a/.settings/language.settings.xml b/.settings/language.settings.xml
index a8d9d50..8ba50e9 100644
--- a/.settings/language.settings.xml
+++ b/.settings/language.settings.xml
@@ -2,13 +2,13 @@
 <project>
 	<configuration id="cdt.managedbuild.toolchain.gnu.mingw.base.1119687795" name="Default">
 		<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
-			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
-			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
-			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuildCommandParser" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser" keep-relative-paths="false" name="CDT GCC Build Output Parser" parameter="(g?cc)|([gc]\+\+)|(clang)" prefer-non-shared="true"/>
-			<provider class="org.eclipse.cdt.managedbuilder.internal.language.settings.providers.GCCBuiltinSpecsDetectorMinGW" console="false" env-hash="-797032510223863550" id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetectorMinGW" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings MinGW" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="org.eclipse.cdt.managedbuilder.internal.language.settings.providers.GCCBuiltinSpecsDetectorMinGW" console="false" env-hash="-853214798705706782" id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetectorMinGW" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings MinGW" parameter="${COMMAND} ${FLAGS} -E -P -v -dD -std=c++14 &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
+			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
+			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
+			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuildCommandParser" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser" keep-relative-paths="false" name="CDT GCC Build Output Parser" parameter="(g?cc)|([gc]\+\+)|(clang)" prefer-non-shared="true"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
 		</extension>
 	</configuration>
diff --git a/demo/main.cpp b/demo/main.cpp
index 44e1b7a..0c4cc56 100644
--- a/demo/main.cpp
+++ b/demo/main.cpp
@@ -1,44 +1,47 @@
-#include <QString>
-#include <QFile>
-#include <QApplication>
-#include <QDebug>
-
-#include "mainwindow.h"
-
-
-void myMessageOutput(QtMsgType type, const QMessageLogContext &context, const QString &msg)
-{
-    QByteArray localMsg = msg.toLocal8Bit();
-    switch (type) {
-    case QtDebugMsg:
-        fprintf(stdout, "Debug: %s (%s:%u, %s)\n", localMsg.constData(), context.file, context.line, context.function);
-        break;
-    case QtInfoMsg:
-        fprintf(stdout, "Info: %s (%s:%u, %s)\n", localMsg.constData(), context.file, context.line, context.function);
-        break;
-    case QtWarningMsg:
-        fprintf(stderr, "Warning: %s (%s:%u, %s)\n", localMsg.constData(), context.file, context.line, context.function);
-        break;
-    case QtCriticalMsg:
-        fprintf(stderr, "Critical: %s (%s:%u, %s)\n", localMsg.constData(), context.file, context.line, context.function);
-        break;
-    case QtFatalMsg:
-        fprintf(stderr, "Fatal: %s (%s:%u, %s)\n", localMsg.constData(), context.file, context.line, context.function);
-        abort();
-    }
-
-    fflush(stderr);
-    fflush(stdout);
-}
-
-int main(int argc, char *argv[])
-{
-	QApplication a(argc, argv);
-	a.setQuitOnLastWindowClosed(true);
-	qInstallMessageHandler(myMessageOutput);
-	qDebug() << "Message handler test";
-
-	MainWindow mw;
-	mw.show();
-	return a.exec();
-}
+#include <QString>
+#include <QFile>
+#include <QApplication>
+#include <QDebug>
+
+#include <memory>
+
+#include "mainwindow.h"
+
+
+void myMessageOutput(QtMsgType type, const QMessageLogContext &context, const QString &msg)
+{
+    QByteArray localMsg = msg.toLocal8Bit();
+    switch (type) {
+    case QtDebugMsg:
+        fprintf(stdout, "Debug: %s (%s:%u, %s)\n", localMsg.constData(), context.file, context.line, context.function);
+        break;
+    case QtInfoMsg:
+        fprintf(stdout, "Info: %s (%s:%u, %s)\n", localMsg.constData(), context.file, context.line, context.function);
+        break;
+    case QtWarningMsg:
+        fprintf(stderr, "Warning: %s (%s:%u, %s)\n", localMsg.constData(), context.file, context.line, context.function);
+        break;
+    case QtCriticalMsg:
+        fprintf(stderr, "Critical: %s (%s:%u, %s)\n", localMsg.constData(), context.file, context.line, context.function);
+        break;
+    case QtFatalMsg:
+        fprintf(stderr, "Fatal: %s (%s:%u, %s)\n", localMsg.constData(), context.file, context.line, context.function);
+        abort();
+    }
+
+    fflush(stderr);
+    fflush(stdout);
+}
+
+int main(int argc, char *argv[])
+{
+	std::shared_ptr<int> b;
+	QApplication a(argc, argv);
+	a.setQuitOnLastWindowClosed(true);
+	qInstallMessageHandler(myMessageOutput);
+	qDebug() << "Message handler test";
+
+	MainWindow mw;
+	mw.show();
+	return a.exec();
+}
diff --git a/src/DockOverlay.cpp b/src/DockOverlay.cpp
index 4174a0d..27ac87c 100644
--- a/src/DockOverlay.cpp
+++ b/src/DockOverlay.cpp
@@ -1,607 +1,617 @@
-/*******************************************************************************
-** QtAdcancedDockingSystem
-** Copyright (C) 2017 Uwe Kindler
-**
-** This program is free software: you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation, either version 3 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program. If not, see <http://www.gnu.org/licenses/>.
-******************************************************************************/
-
-
-//============================================================================
-//                                   INCLUDES
-//============================================================================
-#include "DockOverlay.h"
-
-#include <QPointer>
-#include <QPaintEvent>
-#include <QResizeEvent>
-#include <QMoveEvent>
-#include <QPainter>
-#include <QGridLayout>
-#include <QCursor>
-#include <QIcon>
-#include <QLabel>
-#include <QtGlobal>
-#include <QDebug>
-
-#include "DockAreaWidget.h"
-
-namespace ads
-{
-//============================================================================
-static QPixmap createDropIndicatorPixmap(const QPalette& pal, const QSizeF& size, DockWidgetArea DockWidgetArea,
-	CDockOverlay::eMode Mode)
-{
-	QColor borderColor = pal.color(QPalette::Active, QPalette::Highlight);
-	QColor backgroundColor = pal.color(QPalette::Active, QPalette::Base);
-
-	QPixmap pm(size.width(), size.height());
-	pm.fill(QColor(0, 0, 0, 0));
-
-	QPainter p(&pm);
-	QPen pen = p.pen();
-	QRectF ShadowRect(pm.rect());
-	QRectF baseRect;
-	baseRect.setSize(ShadowRect.size() * 0.7);
-	baseRect.moveCenter(ShadowRect.center());
-
-	// Fill
-	p.fillRect(ShadowRect, QColor(0, 0, 0, 64));
-
-	// Drop area rect.
-	p.save();
-	QRectF areaRect;
-	QLineF areaLine;
-	QRectF nonAreaRect;
-	switch (DockWidgetArea)
-	{
-		case TopDockWidgetArea:
-			areaRect = QRectF(baseRect.x(), baseRect.y(), baseRect.width(), baseRect.height() * .5f);
-			nonAreaRect = QRectF(baseRect.x(), ShadowRect.height() * .5f, baseRect.width(), baseRect.height() * .5f);
-			areaLine = QLineF(areaRect.bottomLeft(), areaRect.bottomRight());
-			break;
-		case RightDockWidgetArea:
-			areaRect = QRectF(ShadowRect.width() * .5f, baseRect.y(), baseRect.width() * .5f, baseRect.height());
-			nonAreaRect = QRectF(baseRect.x(), baseRect.y(), baseRect.width() * .5f, baseRect.height());
-			areaLine = QLineF(areaRect.topLeft(), areaRect.bottomLeft());
-			break;
-		case BottomDockWidgetArea:
-			areaRect = QRectF(baseRect.x(), ShadowRect.height() * .5f, baseRect.width(), baseRect.height() * .5f);
-			nonAreaRect = QRectF(baseRect.x(), baseRect.y(), baseRect.width(), baseRect.height() * .5f);
-			areaLine = QLineF(areaRect.topLeft(), areaRect.topRight());
-			break;
-		case LeftDockWidgetArea:
-			areaRect = QRectF(baseRect.x(), baseRect.y(), baseRect.width() * .5f, baseRect.height());
-			nonAreaRect = QRectF(ShadowRect.width() * .5f, baseRect.y(), baseRect.width() * .5f, baseRect.height());
-			areaLine = QLineF(areaRect.topRight(), areaRect.bottomRight());
-			break;
-		default:
-			break;
-	}
-
-	QSizeF baseSize = baseRect.size();
-	if (CDockOverlay::ModeContainerOverlay == Mode && DockWidgetArea != CenterDockWidgetArea)
-	{
-		baseRect = areaRect;
-	}
-
-	p.fillRect(baseRect, backgroundColor);
-	if (areaRect.isValid())
-	{
-		pen = p.pen();
-		pen.setColor(borderColor);
-		QColor Color = borderColor;
-		Color.setAlpha(64);
-		p.setBrush(Color);
-		p.setPen(Qt::NoPen);
-		p.drawRect(areaRect);
-
-		pen = p.pen();
-		pen.setColor(borderColor);
-		pen.setStyle(Qt::DashLine);
-		p.setPen(pen);
-		p.drawLine(areaLine);
-	}
-	p.restore();
-
-	p.save();
-	// Draw outer border
-	pen = p.pen();
-	pen.setColor(borderColor);
-	pen.setWidth(1);
-	p.setBrush(Qt::NoBrush);
-	p.setPen(pen);
-	p.drawRect(baseRect);
-
-	// draw window title bar
-	p.setBrush(borderColor);
-	QRectF FrameRect(baseRect.topLeft(), QSizeF(baseRect.width(), baseSize.height() / 10));
-	p.drawRect(FrameRect);
-	p.restore();
-
-	// Draw arrow for outer container drop indicators
-	if (CDockOverlay::ModeContainerOverlay == Mode && DockWidgetArea != CenterDockWidgetArea)
-	{
-		QRectF ArrowRect;
-		ArrowRect.setSize(baseSize);
-		ArrowRect.setWidth(ArrowRect.width() / 4.6);
-		ArrowRect.setHeight(ArrowRect.height() / 2);
-		ArrowRect.moveCenter(QPointF(0, 0));
-		QPolygonF Arrow;
-		Arrow << ArrowRect.topLeft()
-			<< QPointF( ArrowRect.right(),  ArrowRect.center().y())
-			<< ArrowRect.bottomLeft();
-		p.setPen(Qt::NoPen);
-		p.setBrush(backgroundColor);
-		p.setRenderHint(QPainter::Antialiasing, true);
-		p.translate(nonAreaRect.center().x(), nonAreaRect.center().y());
-
-		switch (DockWidgetArea)
-		{
-		case TopDockWidgetArea:
-			 p.rotate(-90);
-			 break;
-		case RightDockWidgetArea:
-			 break;
-		case BottomDockWidgetArea:
-			 p.rotate(90);
-			 break;
-		case LeftDockWidgetArea:
-			p.rotate(180);
-			 break;
-		default:
-			 break;
-		}
-
-		p.drawPolygon(Arrow);
-	}
-
-	return pm;
-}
-
-
-//============================================================================
-QWidget* createDropIndicatorWidget(DockWidgetArea DockWidgetArea,
-	CDockOverlay::eMode Mode)
-{
-	QLabel* l = new QLabel();
-	l->setObjectName("DockWidgetAreaLabel");
-
-	const qreal metric = static_cast<qreal>(l->fontMetrics().height()) * 3.f;
-	const QSizeF size(metric, metric);
-
-	l->setPixmap(createDropIndicatorPixmap(l->palette(), size, DockWidgetArea,
-		Mode));
-	l->setWindowFlags(Qt::Tool | Qt::FramelessWindowHint);
-	l->setAttribute(Qt::WA_TranslucentBackground);
-	return l;
-}
-
-
-/**
- * Private data class of CDockOverlay
- */
-struct DockOverlayPrivate
-{
-	CDockOverlay* _this;
-	DockWidgetAreas AllowedAreas = InvalidDockWidgetArea;
-	CDockOverlayCross* Cross;
-	QPointer<QWidget> TargetWidget;
-	QRect TargetRect;
-	DockWidgetArea LastLocation = InvalidDockWidgetArea;
-	bool DropPreviewEnabled = true;
-	CDockOverlay::eMode Mode = CDockOverlay::ModeDockAreaOverlay;
-
-	/**
-	 * Private data constructor
-	 */
-	DockOverlayPrivate(CDockOverlay* _public) : _this(_public) {}
-};
-
-/**
- * Private data of CDockOverlayCross class
- */
-struct DockOverlayCrossPrivate
-{
-	CDockOverlayCross* _this;
-	CDockOverlay::eMode Mode = CDockOverlay::ModeDockAreaOverlay;
-	CDockOverlay* DockOverlay;
-	QHash<DockWidgetArea, QWidget*> DropIndicatorWidgets;
-	QGridLayout* GridLayout;
-
-	/**
-	 * Private data constructor
-	 */
-	DockOverlayCrossPrivate(CDockOverlayCross* _public) : _this(_public) {}
-
-	/**
-	 *
-	 * @param area
-	 * @return
-	 */
-	QPoint areaGridPosition(const DockWidgetArea area);
-};
-
-
-//============================================================================
-CDockOverlay::CDockOverlay(QWidget* parent, eMode Mode) :
-	QFrame(parent),
-	d(new DockOverlayPrivate(this))
-{
-	d->Mode = Mode;
-	d->Cross = new CDockOverlayCross(this);
-	setWindowFlags(Qt::Tool | Qt::FramelessWindowHint);
-	setWindowOpacity(1);
-	setWindowTitle("DockOverlay");
-	setAttribute(Qt::WA_NoSystemBackground);
-	setAttribute(Qt::WA_TranslucentBackground);
-
-	QBoxLayout* l = new QBoxLayout(QBoxLayout::TopToBottom);
-	l->setSpacing(0);
-	setLayout(l);
-	l->setContentsMargins(QMargins(0, 0, 0, 0));
-	l->addWidget(d->Cross);
-
-	d->Cross->setupOverlayCross(Mode);
-	d->Cross->setVisible(false);
-	setVisible(false);
-}
-
-
-//============================================================================
-CDockOverlay::~CDockOverlay()
-{
-	delete d;
-}
-
-
-//============================================================================
-void CDockOverlay::setAllowedAreas(DockWidgetAreas areas)
-{
-	if (areas == d->AllowedAreas)
-		return;
-	d->AllowedAreas = areas;
-	d->Cross->reset();
-}
-
-
-//============================================================================
-DockWidgetAreas CDockOverlay::allowedAreas() const
-{
-	return d->AllowedAreas;
-}
-
-
-//============================================================================
-DockWidgetArea CDockOverlay::dropAreaUnderCursor() const
-{
-	DockWidgetArea Result = d->Cross->cursorLocation();
-	if (Result != InvalidDockWidgetArea)
-	{
-		return Result;
-	}
-
-	CDockAreaWidget* DockArea = dynamic_cast<CDockAreaWidget*>(d->TargetWidget.data());
-	if (!DockArea)
-	{
-		return Result;
-	}
-
-	if (DockArea->titleAreaGeometry().contains(DockArea->mapFromGlobal(QCursor::pos())))
-	{
-		return CenterDockWidgetArea;
-	}
-
-	return Result;
-}
-
-
-//============================================================================
-DockWidgetArea CDockOverlay::showOverlay(QWidget* target)
-{
-	if (d->TargetWidget == target)
-	{
-		// Hint: We could update geometry of overlay here.
-		DockWidgetArea da = dropAreaUnderCursor();
-		if (da != d->LastLocation)
-		{
-			repaint();
-			d->LastLocation = da;
-		}
-		return da;
-	}
-
-	d->TargetWidget = target;
-	d->TargetRect = QRect();
-	d->LastLocation = InvalidDockWidgetArea;
-
-	// Move it over the target.
-	resize(target->size());
-	QPoint TopLeft = target->mapToGlobal(target->rect().topLeft());
-	move(TopLeft);
-	show();
-	return dropAreaUnderCursor();
-}
-
-
-//============================================================================
-void CDockOverlay::hideOverlay()
-{
-	hide();
-	d->TargetWidget.clear();
-	d->TargetRect = QRect();
-	d->LastLocation = InvalidDockWidgetArea;
-}
-
-
-//============================================================================
-void CDockOverlay::enableDropPreview(bool Enable)
-{
-	d->DropPreviewEnabled = Enable;
-	update();
-}
-
-
-//============================================================================
-void CDockOverlay::paintEvent(QPaintEvent* event)
-{
-	Q_UNUSED(event);
-	// Draw rect based on location
-	if (!d->DropPreviewEnabled)
-	{
-		return;
-	}
-
-	QRect r = rect();
-	const DockWidgetArea da = dropAreaUnderCursor();
-	//std::cout << "CursorLocation: " << dropAreaUnderCursor() << std::endl;
-
-	double Factor = (CDockOverlay::ModeContainerOverlay == d->Mode) ?
-		3 : 2;
-
-	switch (da)
-	{
-    case TopDockWidgetArea: r.setHeight(r.height() / Factor); break;
-	case RightDockWidgetArea: r.setX(r.width() * (1 - 1 / Factor)); break;
-	case BottomDockWidgetArea: r.setY(r.height() * (1 - 1 / Factor)); break;
-	case LeftDockWidgetArea: r.setWidth(r.width() / Factor); break;
-	case CenterDockWidgetArea: r = rect();break;
-	default: return;
-	}
-	QPainter painter(this);
-    QColor Color = palette().color(QPalette::Active, QPalette::Highlight);
-    Color.setAlpha(64);
-    painter.setPen(Qt::NoPen);
-	painter.fillRect(r, Color);
-}
-
-
-//============================================================================
-void CDockOverlay::showEvent(QShowEvent* e)
-{
-	d->Cross->show();
-	QFrame::showEvent(e);
-}
-
-
-//============================================================================
-void CDockOverlay::hideEvent(QHideEvent* e)
-{
-	d->Cross->hide();
-	QFrame::hideEvent(e);
-}
-
-
-//============================================================================
-static int areaAlignment(const DockWidgetArea area)
-{
-	switch (area)
-	{
-		case TopDockWidgetArea: return (int) Qt::AlignHCenter | Qt::AlignBottom;
-		case RightDockWidgetArea: return (int) Qt::AlignLeft | Qt::AlignVCenter;
-		case BottomDockWidgetArea: return (int) Qt::AlignHCenter | Qt::AlignTop;
-		case LeftDockWidgetArea: return (int) Qt::AlignRight | Qt::AlignVCenter;
-		case CenterDockWidgetArea:  return (int) Qt::AlignCenter;
-		default: return Qt::AlignCenter;
-	}
-}
-
-//============================================================================
-// DockOverlayCrossPrivate
-//============================================================================
-QPoint DockOverlayCrossPrivate::areaGridPosition(const DockWidgetArea area)
-{
-	if (CDockOverlay::ModeDockAreaOverlay == Mode)
-	{
-		switch (area)
-		{
-			case TopDockWidgetArea: return QPoint(1, 2);
-			case RightDockWidgetArea: return QPoint(2, 3);
-			case BottomDockWidgetArea: return QPoint(3, 2);
-			case LeftDockWidgetArea: return QPoint(2, 1);
-			case CenterDockWidgetArea: return QPoint(2, 2);
-			default: return QPoint();
-		}
-	}
-	else
-	{
-		switch (area)
-		{
-			case TopDockWidgetArea: return QPoint(0, 2);
-			case RightDockWidgetArea: return QPoint(2, 4);
-			case BottomDockWidgetArea: return QPoint(4, 2);
-			case LeftDockWidgetArea: return QPoint(2, 0);
-			case CenterDockWidgetArea: return QPoint(2, 2);
-			default: return QPoint();
-		}
-	}
-}
-
-
-//============================================================================
-CDockOverlayCross::CDockOverlayCross(CDockOverlay* overlay) :
-	QWidget(overlay->parentWidget()),
-	d(new DockOverlayCrossPrivate(this))
-{
-	d->DockOverlay = overlay;
-	setWindowFlags(Qt::Tool | Qt::FramelessWindowHint);
-	setWindowTitle("DockOverlayCross");
-	setAttribute(Qt::WA_TranslucentBackground);
-
-	d->GridLayout = new QGridLayout();
-	d->GridLayout->setSpacing(0);
-	setLayout(d->GridLayout);
-}
-
-
-//============================================================================
-CDockOverlayCross::~CDockOverlayCross()
-{
-	delete d;
-}
-
-
-//============================================================================
-void CDockOverlayCross::setupOverlayCross(CDockOverlay::eMode Mode)
-{
-	d->Mode = Mode;
-
-	QHash<DockWidgetArea, QWidget*> areaWidgets;
-	areaWidgets.insert(TopDockWidgetArea, createDropIndicatorWidget(TopDockWidgetArea, Mode));
-	areaWidgets.insert(RightDockWidgetArea, createDropIndicatorWidget(RightDockWidgetArea, Mode));
-	areaWidgets.insert(BottomDockWidgetArea, createDropIndicatorWidget(BottomDockWidgetArea, Mode));
-	areaWidgets.insert(LeftDockWidgetArea, createDropIndicatorWidget(LeftDockWidgetArea, Mode));
-	areaWidgets.insert(CenterDockWidgetArea, createDropIndicatorWidget(CenterDockWidgetArea, Mode));
-
-	setAreaWidgets(areaWidgets);
-}
-
-
-//============================================================================
-void CDockOverlayCross::setAreaWidgets(const QHash<DockWidgetArea, QWidget*>& widgets)
-{
-	// Delete old widgets.
-	QMutableHashIterator<DockWidgetArea, QWidget*> i(d->DropIndicatorWidgets);
-	while (i.hasNext())
-	{
-		i.next();
-		QWidget* widget = i.value();
-		d->GridLayout->removeWidget(widget);
-		delete widget;
-		i.remove();
-	}
-
-	// Insert new widgets into grid.
-	d->DropIndicatorWidgets = widgets;
-	QHashIterator<DockWidgetArea, QWidget*> i2(d->DropIndicatorWidgets);
-	while (i2.hasNext())
-	{
-		i2.next();
-		const DockWidgetArea area = i2.key();
-		QWidget* widget = i2.value();
-		QPoint p = d->areaGridPosition(area);
-		d->GridLayout->addWidget(widget, p.x(), p.y(), (Qt::Alignment) areaAlignment(area));
-	}
-
-	if (CDockOverlay::ModeDockAreaOverlay == d->Mode)
-	{
-		d->GridLayout->setContentsMargins(0, 0, 0, 0);
-		d->GridLayout->setRowStretch(0, 1);
-		d->GridLayout->setRowStretch(1, 0);
-		d->GridLayout->setRowStretch(2, 0);
-		d->GridLayout->setRowStretch(3, 0);
-		d->GridLayout->setRowStretch(4, 1);
-
-		d->GridLayout->setColumnStretch(0, 1);
-		d->GridLayout->setColumnStretch(1, 0);
-		d->GridLayout->setColumnStretch(2, 0);
-		d->GridLayout->setColumnStretch(3, 0);
-		d->GridLayout->setColumnStretch(4, 1);
-	}
-	else
-	{
-		d->GridLayout->setContentsMargins(4, 4, 4, 4);
-		d->GridLayout->setRowStretch(0, 0);
-		d->GridLayout->setRowStretch(1, 1);
-		d->GridLayout->setRowStretch(2, 1);
-		d->GridLayout->setRowStretch(3, 1);
-		d->GridLayout->setRowStretch(4, 0);
-
-		d->GridLayout->setColumnStretch(0, 0);
-		d->GridLayout->setColumnStretch(1, 1);
-		d->GridLayout->setColumnStretch(2, 1);
-		d->GridLayout->setColumnStretch(3, 1);
-		d->GridLayout->setColumnStretch(4, 0);
-	}
-	reset();
-}
-
-
-//============================================================================
-DockWidgetArea CDockOverlayCross::cursorLocation() const
-{
-	const QPoint pos = mapFromGlobal(QCursor::pos());
-	QHashIterator<DockWidgetArea, QWidget*> i(d->DropIndicatorWidgets);
-	while (i.hasNext())
-	{
-		i.next();
-		if (d->DockOverlay->allowedAreas().testFlag(i.key())
-			&& i.value()
-			&& i.value()->isVisible()
-			&& i.value()->geometry().contains(pos))
-		{
-			return i.key();
-		}
-	}
-	return InvalidDockWidgetArea;
-}
-
-
-//============================================================================
-void CDockOverlayCross::showEvent(QShowEvent*)
-{
-	resize(d->DockOverlay->size());
-	QPoint TopLeft = d->DockOverlay->pos();
-	QPoint Offest((this->width() - d->DockOverlay->width()) / 2,
-		(this->height() - d->DockOverlay->height()) / 2);
-	QPoint CrossTopLeft = TopLeft - Offest;
-	move(CrossTopLeft);
-}
-
-
-//============================================================================
-void CDockOverlayCross::reset()
-{
-	QList<DockWidgetArea> allAreas;
-	allAreas << TopDockWidgetArea << RightDockWidgetArea
-		<< BottomDockWidgetArea << LeftDockWidgetArea << CenterDockWidgetArea;
-	const DockWidgetAreas allowedAreas = d->DockOverlay->allowedAreas();
-
-	// Update visibility of area widgets based on allowedAreas.
-	for (int i = 0; i < allAreas.count(); ++i)
-	{
-		QPoint p = d->areaGridPosition(allAreas.at(i));
-		QLayoutItem* item = d->GridLayout->itemAtPosition(p.x(), p.y());
-		QWidget* w = nullptr;
-		if (item && (w = item->widget()) != nullptr)
-		{
-			w->setVisible(allowedAreas.testFlag(allAreas.at(i)));
-		}
-	}
-}
-
-
-
-} // namespace ads
-//----------------------------------------------------------------------------
-
+/*******************************************************************************
+** QtAdcancedDockingSystem
+** Copyright (C) 2017 Uwe Kindler
+**
+** This program is free software: you can redistribute it and/or modify
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation, either version 3 of the License, or
+** (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program. If not, see <http://www.gnu.org/licenses/>.
+******************************************************************************/
+
+
+//============================================================================
+//                                   INCLUDES
+//============================================================================
+#include "DockOverlay.h"
+
+#include <QPointer>
+#include <QPaintEvent>
+#include <QResizeEvent>
+#include <QMoveEvent>
+#include <QPainter>
+#include <QGridLayout>
+#include <QCursor>
+#include <QIcon>
+#include <QLabel>
+#include <QtGlobal>
+#include <QDebug>
+
+#include "DockAreaWidget.h"
+
+namespace ads
+{
+//============================================================================
+static QPixmap createDropIndicatorPixmap(const QPalette& pal, const QSizeF& size, DockWidgetArea DockWidgetArea,
+	CDockOverlay::eMode Mode)
+{
+	QColor borderColor = pal.color(QPalette::Active, QPalette::Highlight);
+	QColor backgroundColor = pal.color(QPalette::Active, QPalette::Base);
+
+	QPixmap pm(size.width(), size.height());
+	pm.fill(QColor(0, 0, 0, 0));
+
+	QPainter p(&pm);
+	QPen pen = p.pen();
+	QRectF ShadowRect(pm.rect());
+	QRectF baseRect;
+	baseRect.setSize(ShadowRect.size() * 0.7);
+	baseRect.moveCenter(ShadowRect.center());
+
+	// Fill
+	p.fillRect(ShadowRect, QColor(0, 0, 0, 64));
+
+	// Drop area rect.
+	p.save();
+	QRectF areaRect;
+	QLineF areaLine;
+	QRectF nonAreaRect;
+	switch (DockWidgetArea)
+	{
+		case TopDockWidgetArea:
+			areaRect = QRectF(baseRect.x(), baseRect.y(), baseRect.width(), baseRect.height() * .5f);
+			nonAreaRect = QRectF(baseRect.x(), ShadowRect.height() * .5f, baseRect.width(), baseRect.height() * .5f);
+			areaLine = QLineF(areaRect.bottomLeft(), areaRect.bottomRight());
+			break;
+		case RightDockWidgetArea:
+			areaRect = QRectF(ShadowRect.width() * .5f, baseRect.y(), baseRect.width() * .5f, baseRect.height());
+			nonAreaRect = QRectF(baseRect.x(), baseRect.y(), baseRect.width() * .5f, baseRect.height());
+			areaLine = QLineF(areaRect.topLeft(), areaRect.bottomLeft());
+			break;
+		case BottomDockWidgetArea:
+			areaRect = QRectF(baseRect.x(), ShadowRect.height() * .5f, baseRect.width(), baseRect.height() * .5f);
+			nonAreaRect = QRectF(baseRect.x(), baseRect.y(), baseRect.width(), baseRect.height() * .5f);
+			areaLine = QLineF(areaRect.topLeft(), areaRect.topRight());
+			break;
+		case LeftDockWidgetArea:
+			areaRect = QRectF(baseRect.x(), baseRect.y(), baseRect.width() * .5f, baseRect.height());
+			nonAreaRect = QRectF(ShadowRect.width() * .5f, baseRect.y(), baseRect.width() * .5f, baseRect.height());
+			areaLine = QLineF(areaRect.topRight(), areaRect.bottomRight());
+			break;
+		default:
+			break;
+	}
+
+	QSizeF baseSize = baseRect.size();
+	if (CDockOverlay::ModeContainerOverlay == Mode && DockWidgetArea != CenterDockWidgetArea)
+	{
+		baseRect = areaRect;
+	}
+
+	p.fillRect(baseRect, backgroundColor);
+	if (areaRect.isValid())
+	{
+		pen = p.pen();
+		pen.setColor(borderColor);
+		QColor Color = borderColor;
+		Color.setAlpha(64);
+		p.setBrush(Color);
+		p.setPen(Qt::NoPen);
+		p.drawRect(areaRect);
+
+		pen = p.pen();
+		pen.setColor(borderColor);
+		pen.setStyle(Qt::DashLine);
+		p.setPen(pen);
+		p.drawLine(areaLine);
+	}
+	p.restore();
+
+	p.save();
+	// Draw outer border
+	pen = p.pen();
+	pen.setColor(borderColor);
+	pen.setWidth(1);
+	p.setBrush(Qt::NoBrush);
+	p.setPen(pen);
+	p.drawRect(baseRect);
+
+	// draw window title bar
+	p.setBrush(borderColor);
+	QRectF FrameRect(baseRect.topLeft(), QSizeF(baseRect.width(), baseSize.height() / 10));
+	p.drawRect(FrameRect);
+	p.restore();
+
+	// Draw arrow for outer container drop indicators
+	if (CDockOverlay::ModeContainerOverlay == Mode && DockWidgetArea != CenterDockWidgetArea)
+	{
+		QRectF ArrowRect;
+		ArrowRect.setSize(baseSize);
+		ArrowRect.setWidth(ArrowRect.width() / 4.6);
+		ArrowRect.setHeight(ArrowRect.height() / 2);
+		ArrowRect.moveCenter(QPointF(0, 0));
+		QPolygonF Arrow;
+		Arrow << ArrowRect.topLeft()
+			<< QPointF( ArrowRect.right(),  ArrowRect.center().y())
+			<< ArrowRect.bottomLeft();
+		p.setPen(Qt::NoPen);
+		p.setBrush(backgroundColor);
+		p.setRenderHint(QPainter::Antialiasing, true);
+		p.translate(nonAreaRect.center().x(), nonAreaRect.center().y());
+
+		switch (DockWidgetArea)
+		{
+		case TopDockWidgetArea:
+			 p.rotate(-90);
+			 break;
+		case RightDockWidgetArea:
+			 break;
+		case BottomDockWidgetArea:
+			 p.rotate(90);
+			 break;
+		case LeftDockWidgetArea:
+			p.rotate(180);
+			 break;
+		default:
+			 break;
+		}
+
+		p.drawPolygon(Arrow);
+	}
+
+	return pm;
+}
+
+
+//============================================================================
+QWidget* createDropIndicatorWidget(DockWidgetArea DockWidgetArea,
+	CDockOverlay::eMode Mode)
+{
+	QLabel* l = new QLabel();
+	l->setObjectName("DockWidgetAreaLabel");
+
+	const qreal metric = static_cast<qreal>(l->fontMetrics().height()) * 3.f;
+	const QSizeF size(metric, metric);
+
+	l->setPixmap(createDropIndicatorPixmap(l->palette(), size, DockWidgetArea,
+		Mode));
+	l->setWindowFlags(Qt::Tool | Qt::FramelessWindowHint);
+	l->setAttribute(Qt::WA_TranslucentBackground);
+	return l;
+}
+
+
+/**
+ * Private data class of CDockOverlay
+ */
+struct DockOverlayPrivate
+{
+	CDockOverlay* _this;
+	DockWidgetAreas AllowedAreas = InvalidDockWidgetArea;
+	CDockOverlayCross* Cross;
+	QPointer<QWidget> TargetWidget;
+	QRect TargetRect;
+	DockWidgetArea LastLocation = InvalidDockWidgetArea;
+	bool DropPreviewEnabled = true;
+	CDockOverlay::eMode Mode = CDockOverlay::ModeDockAreaOverlay;
+	QRect DropAreaRect;
+
+	/**
+	 * Private data constructor
+	 */
+	DockOverlayPrivate(CDockOverlay* _public) : _this(_public) {}
+};
+
+/**
+ * Private data of CDockOverlayCross class
+ */
+struct DockOverlayCrossPrivate
+{
+	CDockOverlayCross* _this;
+	CDockOverlay::eMode Mode = CDockOverlay::ModeDockAreaOverlay;
+	CDockOverlay* DockOverlay;
+	QHash<DockWidgetArea, QWidget*> DropIndicatorWidgets;
+	QGridLayout* GridLayout;
+
+	/**
+	 * Private data constructor
+	 */
+	DockOverlayCrossPrivate(CDockOverlayCross* _public) : _this(_public) {}
+
+	/**
+	 *
+	 * @param area
+	 * @return
+	 */
+	QPoint areaGridPosition(const DockWidgetArea area);
+};
+
+
+//============================================================================
+CDockOverlay::CDockOverlay(QWidget* parent, eMode Mode) :
+	QFrame(parent),
+	d(new DockOverlayPrivate(this))
+{
+	d->Mode = Mode;
+	d->Cross = new CDockOverlayCross(this);
+	setWindowFlags(Qt::Tool | Qt::FramelessWindowHint);
+	setWindowOpacity(1);
+	setWindowTitle("DockOverlay");
+	setAttribute(Qt::WA_NoSystemBackground);
+	setAttribute(Qt::WA_TranslucentBackground);
+
+	d->Cross->setupOverlayCross(Mode);
+	d->Cross->setVisible(false);
+	setVisible(false);
+}
+
+
+//============================================================================
+CDockOverlay::~CDockOverlay()
+{
+	delete d;
+}
+
+
+//============================================================================
+void CDockOverlay::setAllowedAreas(DockWidgetAreas areas)
+{
+	if (areas == d->AllowedAreas)
+		return;
+	d->AllowedAreas = areas;
+	d->Cross->reset();
+}
+
+
+//============================================================================
+DockWidgetAreas CDockOverlay::allowedAreas() const
+{
+	return d->AllowedAreas;
+}
+
+
+//============================================================================
+DockWidgetArea CDockOverlay::dropAreaUnderCursor() const
+{
+	DockWidgetArea Result = d->Cross->cursorLocation();
+	if (Result != InvalidDockWidgetArea)
+	{
+		return Result;
+	}
+
+	CDockAreaWidget* DockArea = dynamic_cast<CDockAreaWidget*>(d->TargetWidget.data());
+	if (!DockArea)
+	{
+		return Result;
+	}
+
+	if (DockArea->titleAreaGeometry().contains(DockArea->mapFromGlobal(QCursor::pos())))
+	{
+		return CenterDockWidgetArea;
+	}
+
+	return Result;
+}
+
+
+//============================================================================
+DockWidgetArea CDockOverlay::showOverlay(QWidget* target)
+{
+	if (d->TargetWidget == target)
+	{
+		// Hint: We could update geometry of overlay here.
+		DockWidgetArea da = dropAreaUnderCursor();
+		if (da != d->LastLocation)
+		{
+			repaint();
+			d->LastLocation = da;
+		}
+		return da;
+	}
+
+	d->TargetWidget = target;
+	d->TargetRect = QRect();
+	d->LastLocation = InvalidDockWidgetArea;
+
+	// Move it over the target.
+	resize(target->size());
+	QPoint TopLeft = target->mapToGlobal(target->rect().topLeft());
+	move(TopLeft);
+	show();
+	d->Cross->updatePosition();
+	return dropAreaUnderCursor();
+}
+
+
+//============================================================================
+void CDockOverlay::hideOverlay()
+{
+	hide();
+	d->TargetWidget.clear();
+	d->TargetRect = QRect();
+	d->LastLocation = InvalidDockWidgetArea;
+}
+
+
+//============================================================================
+void CDockOverlay::enableDropPreview(bool Enable)
+{
+	d->DropPreviewEnabled = Enable;
+	update();
+}
+
+
+//============================================================================
+void CDockOverlay::paintEvent(QPaintEvent* event)
+{
+	Q_UNUSED(event);
+	// Draw rect based on location
+	if (!d->DropPreviewEnabled)
+	{
+		d->DropAreaRect = QRect();
+		return;
+	}
+
+	QRect r = rect();
+	const DockWidgetArea da = dropAreaUnderCursor();
+	double Factor = (CDockOverlay::ModeContainerOverlay == d->Mode) ?
+		3 : 2;
+
+	switch (da)
+	{
+    case TopDockWidgetArea: r.setHeight(r.height() / Factor); break;
+	case RightDockWidgetArea: r.setX(r.width() * (1 - 1 / Factor)); break;
+	case BottomDockWidgetArea: r.setY(r.height() * (1 - 1 / Factor)); break;
+	case LeftDockWidgetArea: r.setWidth(r.width() / Factor); break;
+	case CenterDockWidgetArea: r = rect();break;
+	default: return;
+	}
+	QPainter painter(this);
+    QColor Color = palette().color(QPalette::Active, QPalette::Highlight);
+    Color.setAlpha(64);
+    painter.setPen(Qt::NoPen);
+	painter.fillRect(r, Color);
+	d->DropAreaRect = r;
+}
+
+
+//============================================================================
+QRect CDockOverlay::dropOverlayRect() const
+{
+	return d->DropAreaRect;
+}
+
+
+//============================================================================
+void CDockOverlay::showEvent(QShowEvent* e)
+{
+	d->Cross->show();
+	QFrame::showEvent(e);
+}
+
+
+//============================================================================
+void CDockOverlay::hideEvent(QHideEvent* e)
+{
+	d->Cross->hide();
+	QFrame::hideEvent(e);
+}
+
+
+//============================================================================
+static int areaAlignment(const DockWidgetArea area)
+{
+	switch (area)
+	{
+		case TopDockWidgetArea: return (int) Qt::AlignHCenter | Qt::AlignBottom;
+		case RightDockWidgetArea: return (int) Qt::AlignLeft | Qt::AlignVCenter;
+		case BottomDockWidgetArea: return (int) Qt::AlignHCenter | Qt::AlignTop;
+		case LeftDockWidgetArea: return (int) Qt::AlignRight | Qt::AlignVCenter;
+		case CenterDockWidgetArea:  return (int) Qt::AlignCenter;
+		default: return Qt::AlignCenter;
+	}
+}
+
+//============================================================================
+// DockOverlayCrossPrivate
+//============================================================================
+QPoint DockOverlayCrossPrivate::areaGridPosition(const DockWidgetArea area)
+{
+	if (CDockOverlay::ModeDockAreaOverlay == Mode)
+	{
+		switch (area)
+		{
+			case TopDockWidgetArea: return QPoint(1, 2);
+			case RightDockWidgetArea: return QPoint(2, 3);
+			case BottomDockWidgetArea: return QPoint(3, 2);
+			case LeftDockWidgetArea: return QPoint(2, 1);
+			case CenterDockWidgetArea: return QPoint(2, 2);
+			default: return QPoint();
+		}
+	}
+	else
+	{
+		switch (area)
+		{
+			case TopDockWidgetArea: return QPoint(0, 2);
+			case RightDockWidgetArea: return QPoint(2, 4);
+			case BottomDockWidgetArea: return QPoint(4, 2);
+			case LeftDockWidgetArea: return QPoint(2, 0);
+			case CenterDockWidgetArea: return QPoint(2, 2);
+			default: return QPoint();
+		}
+	}
+}
+
+
+//============================================================================
+CDockOverlayCross::CDockOverlayCross(CDockOverlay* overlay) :
+	QWidget(overlay->parentWidget()),
+	d(new DockOverlayCrossPrivate(this))
+{
+	d->DockOverlay = overlay;
+	setWindowFlags(Qt::Tool | Qt::FramelessWindowHint);
+	setWindowTitle("DockOverlayCross");
+	setAttribute(Qt::WA_TranslucentBackground);
+
+	d->GridLayout = new QGridLayout();
+	d->GridLayout->setSpacing(0);
+	setLayout(d->GridLayout);
+}
+
+
+//============================================================================
+CDockOverlayCross::~CDockOverlayCross()
+{
+	delete d;
+}
+
+
+//============================================================================
+void CDockOverlayCross::setupOverlayCross(CDockOverlay::eMode Mode)
+{
+	d->Mode = Mode;
+
+	QHash<DockWidgetArea, QWidget*> areaWidgets;
+	areaWidgets.insert(TopDockWidgetArea, createDropIndicatorWidget(TopDockWidgetArea, Mode));
+	areaWidgets.insert(RightDockWidgetArea, createDropIndicatorWidget(RightDockWidgetArea, Mode));
+	areaWidgets.insert(BottomDockWidgetArea, createDropIndicatorWidget(BottomDockWidgetArea, Mode));
+	areaWidgets.insert(LeftDockWidgetArea, createDropIndicatorWidget(LeftDockWidgetArea, Mode));
+	areaWidgets.insert(CenterDockWidgetArea, createDropIndicatorWidget(CenterDockWidgetArea, Mode));
+
+	setAreaWidgets(areaWidgets);
+}
+
+
+//============================================================================
+void CDockOverlayCross::setAreaWidgets(const QHash<DockWidgetArea, QWidget*>& widgets)
+{
+	// Delete old widgets.
+	QMutableHashIterator<DockWidgetArea, QWidget*> i(d->DropIndicatorWidgets);
+	while (i.hasNext())
+	{
+		i.next();
+		QWidget* widget = i.value();
+		d->GridLayout->removeWidget(widget);
+		delete widget;
+		i.remove();
+	}
+
+	// Insert new widgets into grid.
+	d->DropIndicatorWidgets = widgets;
+	QHashIterator<DockWidgetArea, QWidget*> i2(d->DropIndicatorWidgets);
+	while (i2.hasNext())
+	{
+		i2.next();
+		const DockWidgetArea area = i2.key();
+		QWidget* widget = i2.value();
+		QPoint p = d->areaGridPosition(area);
+		d->GridLayout->addWidget(widget, p.x(), p.y(), (Qt::Alignment) areaAlignment(area));
+	}
+
+	if (CDockOverlay::ModeDockAreaOverlay == d->Mode)
+	{
+		d->GridLayout->setContentsMargins(0, 0, 0, 0);
+		d->GridLayout->setRowStretch(0, 1);
+		d->GridLayout->setRowStretch(1, 0);
+		d->GridLayout->setRowStretch(2, 0);
+		d->GridLayout->setRowStretch(3, 0);
+		d->GridLayout->setRowStretch(4, 1);
+
+		d->GridLayout->setColumnStretch(0, 1);
+		d->GridLayout->setColumnStretch(1, 0);
+		d->GridLayout->setColumnStretch(2, 0);
+		d->GridLayout->setColumnStretch(3, 0);
+		d->GridLayout->setColumnStretch(4, 1);
+	}
+	else
+	{
+		d->GridLayout->setContentsMargins(4, 4, 4, 4);
+		d->GridLayout->setRowStretch(0, 0);
+		d->GridLayout->setRowStretch(1, 1);
+		d->GridLayout->setRowStretch(2, 1);
+		d->GridLayout->setRowStretch(3, 1);
+		d->GridLayout->setRowStretch(4, 0);
+
+		d->GridLayout->setColumnStretch(0, 0);
+		d->GridLayout->setColumnStretch(1, 1);
+		d->GridLayout->setColumnStretch(2, 1);
+		d->GridLayout->setColumnStretch(3, 1);
+		d->GridLayout->setColumnStretch(4, 0);
+	}
+	reset();
+}
+
+
+//============================================================================
+DockWidgetArea CDockOverlayCross::cursorLocation() const
+{
+	const QPoint pos = mapFromGlobal(QCursor::pos());
+	QHashIterator<DockWidgetArea, QWidget*> i(d->DropIndicatorWidgets);
+	while (i.hasNext())
+	{
+		i.next();
+		if (d->DockOverlay->allowedAreas().testFlag(i.key())
+			&& i.value()
+			&& i.value()->isVisible()
+			&& i.value()->geometry().contains(pos))
+		{
+			return i.key();
+		}
+	}
+	return InvalidDockWidgetArea;
+}
+
+
+//============================================================================
+void CDockOverlayCross::showEvent(QShowEvent*)
+{
+	this->updatePosition();
+}
+
+
+//============================================================================
+void CDockOverlayCross::updatePosition()
+{
+	resize(d->DockOverlay->size());
+	QPoint TopLeft = d->DockOverlay->pos();
+	QPoint Offest((this->width() - d->DockOverlay->width()) / 2,
+		(this->height() - d->DockOverlay->height()) / 2);
+	QPoint CrossTopLeft = TopLeft - Offest;
+	move(CrossTopLeft);
+}
+
+
+//============================================================================
+void CDockOverlayCross::reset()
+{
+	QList<DockWidgetArea> allAreas;
+	allAreas << TopDockWidgetArea << RightDockWidgetArea
+		<< BottomDockWidgetArea << LeftDockWidgetArea << CenterDockWidgetArea;
+	const DockWidgetAreas allowedAreas = d->DockOverlay->allowedAreas();
+
+	// Update visibility of area widgets based on allowedAreas.
+	for (int i = 0; i < allAreas.count(); ++i)
+	{
+		QPoint p = d->areaGridPosition(allAreas.at(i));
+		QLayoutItem* item = d->GridLayout->itemAtPosition(p.x(), p.y());
+		QWidget* w = nullptr;
+		if (item && (w = item->widget()) != nullptr)
+		{
+			w->setVisible(allowedAreas.testFlag(allAreas.at(i)));
+		}
+	}
+}
+
+
+
+} // namespace ads
+//----------------------------------------------------------------------------
+
diff --git a/src/DockOverlay.h b/src/DockOverlay.h
index 250145f..a3b3b42 100644
--- a/src/DockOverlay.h
+++ b/src/DockOverlay.h
@@ -1,156 +1,166 @@
-#ifndef DockOverlayH
-#define DockOverlayH
-/*******************************************************************************
-** QtAdcancedDockingSystem
-** Copyright (C) 2017 Uwe Kindler
-**
-** This program is free software: you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation, either version 3 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program. If not, see <http://www.gnu.org/licenses/>.
-******************************************************************************/
-
-
-//============================================================================
-//                                   INCLUDES
-//============================================================================
-#include <QPointer>
-#include <QHash>
-#include <QRect>
-#include <QFrame>
-class QGridLayout;
-
-#include "ads_globals.h"
-
-namespace ads
-{
-struct DockOverlayPrivate;
-class CDockOverlayCross;
-
-/*!
- * DockOverlay paints a translucent rectangle over another widget. The geometry
- * of the rectangle is based on the mouse location.
- */
-class CDockOverlay : public QFrame
-{
-	Q_OBJECT
-private:
-	DockOverlayPrivate* d; //< private data class
-	friend class DockOverlayPrivate;
-	friend class DockOverlayCross;
-
-public:
-	enum eMode
-	{
-		ModeDockAreaOverlay,
-		ModeContainerOverlay
-	};
-
-	/**
-	 * Creates a dock overlay
-	 */
-	CDockOverlay(QWidget* parent, eMode Mode = ModeDockAreaOverlay);
-
-	/**
-	 * Virtual destructor
-	 */
-	virtual ~CDockOverlay();
-
-	/**
-	 * Configures the areas that are allowed for docking
-	 */
-	void setAllowedAreas(DockWidgetAreas areas);
-
-	/**
-	 * Returns flags with all allowed drop areas
-	 */
-	DockWidgetAreas allowedAreas() const;
-
-	/**
-	 * Returns the drop area under the current cursor location
-	 */
-	DockWidgetArea dropAreaUnderCursor() const;
-
-	/**
-	 * Show the drop overly for the given target widget
-	 */
-	DockWidgetArea showOverlay(QWidget* target);
-
-	/**
-	 * Hides the overlay
-	 */
-	void hideOverlay();
-
-	/**
-	 * Enables / disables the semi transparent overlay rectangle that represents
-	 * the future area of the dropped widget
-	 */
-	void enableDropPreview(bool Enable);
-
-protected:
-	virtual void paintEvent(QPaintEvent *e) override;
-	virtual void showEvent(QShowEvent* e) override;
-	virtual void hideEvent(QHideEvent* e) override;
-};
-
-
-struct DockOverlayCrossPrivate;
-/*!
- * DockOverlayCross shows a cross with 5 different drop area possibilities.
- * I could have handled everything inside DockOverlay, but because of some
- * styling issues it's better to have a separate class for the cross.
- */
-class CDockOverlayCross : public QWidget
-{
-	Q_OBJECT
-private:
-	DockOverlayCrossPrivate* d;
-	friend class DockOverlayCrossPrivate;
-	friend class CDockOverlay;
-
-public:
-	/**
-	 * Creates an overlay corss for the given overlay
-	 */
-	CDockOverlayCross(CDockOverlay* overlay);
-
-	/**
-	 * Virtual destructor
-	 */
-	virtual ~CDockOverlayCross();
-
-	/**
-	 * Returns the dock widget area depending on the current cursor location.
-	 * The function checks, if the mouse cursor is inside of any drop indicator
-	 * widget and returns the corresponding DockWidgetArea.
-	 */
-	DockWidgetArea cursorLocation() const;
-
-	/**
-	 * Sets up the overlay cross for the given overlay mode
-	 */
-	void setupOverlayCross(CDockOverlay::eMode Mode);
-
-	/**
-	 * Resets and updates the
-	 */
-	void reset();
-
-protected:
-	virtual void showEvent(QShowEvent* e) override;
-	void setAreaWidgets(const QHash<DockWidgetArea, QWidget*>& widgets);
-
-private:
-
-}; // CDockOverlayCross
-
-} // namespace ads
-#endif // DockOverlayH
+#ifndef DockOverlayH
+#define DockOverlayH
+/*******************************************************************************
+** QtAdcancedDockingSystem
+** Copyright (C) 2017 Uwe Kindler
+**
+** This program is free software: you can redistribute it and/or modify
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation, either version 3 of the License, or
+** (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program. If not, see <http://www.gnu.org/licenses/>.
+******************************************************************************/
+
+
+//============================================================================
+//                                   INCLUDES
+//============================================================================
+#include <QPointer>
+#include <QHash>
+#include <QRect>
+#include <QFrame>
+class QGridLayout;
+
+#include "ads_globals.h"
+
+namespace ads
+{
+struct DockOverlayPrivate;
+class CDockOverlayCross;
+
+/*!
+ * DockOverlay paints a translucent rectangle over another widget. The geometry
+ * of the rectangle is based on the mouse location.
+ */
+class CDockOverlay : public QFrame
+{
+	Q_OBJECT
+private:
+	DockOverlayPrivate* d; //< private data class
+	friend class DockOverlayPrivate;
+	friend class DockOverlayCross;
+
+public:
+	enum eMode
+	{
+		ModeDockAreaOverlay,
+		ModeContainerOverlay
+	};
+
+	/**
+	 * Creates a dock overlay
+	 */
+	CDockOverlay(QWidget* parent, eMode Mode = ModeDockAreaOverlay);
+
+	/**
+	 * Virtual destructor
+	 */
+	virtual ~CDockOverlay();
+
+	/**
+	 * Configures the areas that are allowed for docking
+	 */
+	void setAllowedAreas(DockWidgetAreas areas);
+
+	/**
+	 * Returns flags with all allowed drop areas
+	 */
+	DockWidgetAreas allowedAreas() const;
+
+	/**
+	 * Returns the drop area under the current cursor location
+	 */
+	DockWidgetArea dropAreaUnderCursor() const;
+
+	/**
+	 * Show the drop overly for the given target widget
+	 */
+	DockWidgetArea showOverlay(QWidget* target);
+
+	/**
+	 * Hides the overlay
+	 */
+	void hideOverlay();
+
+	/**
+	 * Enables / disables the semi transparent overlay rectangle that represents
+	 * the future area of the dropped widget
+	 */
+	void enableDropPreview(bool Enable);
+
+	/**
+	 * The drop overlay rectangle for the target area
+	 */
+	QRect dropOverlayRect() const;
+
+protected:
+	virtual void paintEvent(QPaintEvent *e) override;
+	virtual void showEvent(QShowEvent* e) override;
+	virtual void hideEvent(QHideEvent* e) override;
+};
+
+
+struct DockOverlayCrossPrivate;
+/*!
+ * DockOverlayCross shows a cross with 5 different drop area possibilities.
+ * I could have handled everything inside DockOverlay, but because of some
+ * styling issues it's better to have a separate class for the cross.
+ */
+class CDockOverlayCross : public QWidget
+{
+	Q_OBJECT
+private:
+	DockOverlayCrossPrivate* d;
+	friend class DockOverlayCrossPrivate;
+	friend class CDockOverlay;
+
+public:
+	/**
+	 * Creates an overlay corss for the given overlay
+	 */
+	CDockOverlayCross(CDockOverlay* overlay);
+
+	/**
+	 * Virtual destructor
+	 */
+	virtual ~CDockOverlayCross();
+
+	/**
+	 * Returns the dock widget area depending on the current cursor location.
+	 * The function checks, if the mouse cursor is inside of any drop indicator
+	 * widget and returns the corresponding DockWidgetArea.
+	 */
+	DockWidgetArea cursorLocation() const;
+
+	/**
+	 * Sets up the overlay cross for the given overlay mode
+	 */
+	void setupOverlayCross(CDockOverlay::eMode Mode);
+
+	/**
+	 * Resets and updates the
+	 */
+	void reset();
+
+	/**
+	 * Updates the current position
+	 */
+	void updatePosition();
+
+protected:
+	virtual void showEvent(QShowEvent* e) override;
+	void setAreaWidgets(const QHash<DockWidgetArea, QWidget*>& widgets);
+
+private:
+
+}; // CDockOverlayCross
+
+} // namespace ads
+#endif // DockOverlayH
diff --git a/src/DockSplitter.cpp b/src/DockSplitter.cpp
index c9f27fa..51b4574 100644
--- a/src/DockSplitter.cpp
+++ b/src/DockSplitter.cpp
@@ -1,43 +1,74 @@
-//============================================================================
-/// \file   DockSplitter.cpp
-/// \author Uwe Kindler
-/// \date   24.03.2017
-/// \brief  Implementation of CDockSplitter
-//============================================================================
-
-//============================================================================
-//                                   INCLUDES
-//============================================================================
-#include <DockSplitter.h>
-
-#include <QDebug>
-
-namespace ads
-{
-
-//============================================================================
-CDockSplitter::~CDockSplitter()
-{
-	qDebug() << "~CDockSplitter";
-}
-
-
-//============================================================================
-bool CDockSplitter::hasVisibleContent() const
-{
-	// TODO Cache or precalculate this to speed up
-	for (int i = 0; i < count(); ++i)
-	{
-		if (widget(i)->isVisibleTo(this))
-		{
-			return true;
-		}
-	}
-
-	return false;
-}
-
-} // namespace ads
-
-//---------------------------------------------------------------------------
-// EOF DockSplitter.cpp
+//============================================================================
+/// \file   DockSplitter.cpp
+/// \author Uwe Kindler
+/// \date   24.03.2017
+/// \brief  Implementation of CDockSplitter
+//============================================================================
+
+//============================================================================
+//                                   INCLUDES
+//============================================================================
+#include "DockSplitter.h"
+
+#include <QDebug>
+#include <QChildEvent>
+
+#include "DockAreaWidget.h"
+
+namespace ads
+{
+/**
+ * Private dock splitter data
+ */
+struct DockSplitterPrivate
+{
+	CDockSplitter* _this;
+	int VisibleContentCount = 0;
+
+	DockSplitterPrivate(CDockSplitter* _public) : _this(_public) {}
+};
+
+//============================================================================
+CDockSplitter::CDockSplitter(QWidget *parent)
+	: QSplitter(parent),
+	  d(new DockSplitterPrivate(this))
+{
+
+}
+
+
+//============================================================================
+CDockSplitter::CDockSplitter(Qt::Orientation orientation, QWidget *parent)
+	: QSplitter(orientation, parent),
+	  d(new DockSplitterPrivate(this))
+{
+
+}
+
+//============================================================================
+CDockSplitter::~CDockSplitter()
+{
+	qDebug() << "~CDockSplitter";
+	delete d;
+}
+
+
+//============================================================================
+bool CDockSplitter::hasVisibleContent() const
+{
+	// TODO Cache or precalculate this to speed up
+	for (int i = 0; i < count(); ++i)
+	{
+		if (widget(i)->isVisibleTo(this))
+		{
+			return true;
+		}
+	}
+
+	return false;
+}
+
+} // namespace ads
+
+//---------------------------------------------------------------------------
+// EOF DockSplitter.cpp
diff --git a/src/DockSplitter.h b/src/DockSplitter.h
index 40c8fb4..162bcf4 100644
--- a/src/DockSplitter.h
+++ b/src/DockSplitter.h
@@ -1,41 +1,47 @@
-#ifndef DockSplitterH
-#define DockSplitterH
-//============================================================================
-/// \file   DockSplitter.h
-/// \author Uwe Kindler
-/// \date   24.03.2017
-/// \brief  Declaration of CDockSplitter
-//============================================================================
-
-//============================================================================
-//                                   INCLUDES
-//============================================================================
-#include <QSplitter>
-
-namespace ads
-{
-
-/**
- * Splitter used internally instead of QSplitter
- */
-class CDockSplitter : public QSplitter
-{
-	Q_OBJECT
-public:
-	using QSplitter::QSplitter;
-
-	/**
-	 * Prints debug info
-	 */
-	virtual ~CDockSplitter();
-
-	/**
-	 * Returns true, if any of the internal widgets is visible
-	 */
-	bool hasVisibleContent() const;
-}; // class CDockSplitter
-
-} // namespace ads
-
-//---------------------------------------------------------------------------
-#endif // DockSplitterH
+#ifndef DockSplitterH
+#define DockSplitterH
+//============================================================================
+/// \file   DockSplitter.h
+/// \author Uwe Kindler
+/// \date   24.03.2017
+/// \brief  Declaration of CDockSplitter
+//============================================================================
+
+//============================================================================
+//                                   INCLUDES
+//============================================================================
+#include <QSplitter>
+
+namespace ads
+{
+struct DockSplitterPrivate;
+
+/**
+ * Splitter used internally instead of QSplitter
+ */
+class CDockSplitter : public QSplitter
+{
+	Q_OBJECT
+private:
+	DockSplitterPrivate* d;
+	friend class DockSplitterPrivate;
+
+public:
+	CDockSplitter(QWidget *parent = Q_NULLPTR);
+	CDockSplitter(Qt::Orientation orientation, QWidget *parent = Q_NULLPTR);
+
+	/**
+	 * Prints debug info
+	 */
+	virtual ~CDockSplitter();
+
+	/**
+	 * Returns true, if any of the internal widgets is visible
+	 */
+	bool hasVisibleContent() const;
+}; // class CDockSplitter
+
+} // namespace ads
+
+//---------------------------------------------------------------------------
+#endif // DockSplitterH
diff --git a/src/FloatingDockContainer.cpp b/src/FloatingDockContainer.cpp
index ff1bee9..c8ab378 100644
--- a/src/FloatingDockContainer.cpp
+++ b/src/FloatingDockContainer.cpp
@@ -43,6 +43,7 @@
 #include "DockWidget.h"
 #include "DockOverlay.h"
 
+#include <iostream>
 
 namespace ads
 {
@@ -91,6 +92,18 @@ void FloatingDockContainerPrivate::titleMouseReleaseEvent()
 		return;
 	}
 
+	// Resize the floating widget to the size of the highlighted drop area
+	// rectangle
+	QRect Rect = DockManager->containerOverlay()->dropOverlayRect();
+	if (!Rect.isValid())
+	{
+		Rect = DockManager->dockAreaOverlay()->rect();
+	}
+
+	if (Rect.isValid())
+	{
+		_this->resize(Rect.size());
+	}
 	DropContainer->dropFloatingWidget(_this, QCursor::pos());
 	DockManager->containerOverlay()->hideOverlay();
 	DockManager->dockAreaOverlay()->hideOverlay();