Skip to content

Commit 1fccb94

Browse files
Fixed setWidget function of DockWidget to properly setup the internal scroll area
1 parent 9b56ca0 commit 1fccb94

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

src/DockWidget.cpp

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -243,14 +243,18 @@ void CDockWidget::setToggleViewActionChecked(bool Checked)
243243
void CDockWidget::setWidget(QWidget* widget, eInsertMode InsertMode)
244244
{
245245
QScrollArea* ScrollAreaWidget = qobject_cast<QScrollArea*>(widget);
246-
if (ScrollAreaWidget || ForceNoScrollArea != InsertMode)
246+
if (ScrollAreaWidget || ForceNoScrollArea == InsertMode)
247247
{
248-
d->setupScrollArea();
249-
d->ScrollArea->setWidget(widget);
248+
d->Layout->addWidget(widget);
249+
if (ScrollAreaWidget && ScrollAreaWidget->viewport())
250+
{
251+
ScrollAreaWidget->viewport()->setProperty("dockWidgetContent", true);
252+
}
250253
}
251254
else
252255
{
253-
d->Layout->addWidget(widget);
256+
d->setupScrollArea();
257+
d->ScrollArea->setWidget(widget);
254258
}
255259

256260
d->Widget = widget;

0 commit comments

Comments
 (0)