From 1fccb943fec1109ebf769c20dd62e208c2c4b404 Mon Sep 17 00:00:00 2001
From: Uwe Kindler <uwe_kindler@web.de>
Date: Fri, 10 May 2019 10:32:06 +0200
Subject: [PATCH] Fixed setWidget function of DockWidget to properly setup the
 internal scroll area

---
 src/DockWidget.cpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/DockWidget.cpp b/src/DockWidget.cpp
index 8ecdb13..c8ca3bb 100644
--- a/src/DockWidget.cpp
+++ b/src/DockWidget.cpp
@@ -243,14 +243,18 @@ void CDockWidget::setToggleViewActionChecked(bool Checked)
 void CDockWidget::setWidget(QWidget* widget, eInsertMode InsertMode)
 {
 	QScrollArea* ScrollAreaWidget = qobject_cast<QScrollArea*>(widget);
-	if (ScrollAreaWidget || ForceNoScrollArea != InsertMode)
+	if (ScrollAreaWidget || ForceNoScrollArea == InsertMode)
 	{
-		d->setupScrollArea();
-		d->ScrollArea->setWidget(widget);
+		d->Layout->addWidget(widget);
+		if (ScrollAreaWidget && ScrollAreaWidget->viewport())
+		{
+			ScrollAreaWidget->viewport()->setProperty("dockWidgetContent", true);
+		}
 	}
 	else
 	{
-		d->Layout->addWidget(widget);
+		d->setupScrollArea();
+		d->ScrollArea->setWidget(widget);
 	}
 
 	d->Widget = widget;