File tree Expand file tree Collapse file tree 1 file changed +8
-4
lines changed Expand file tree Collapse file tree 1 file changed +8
-4
lines changed Original file line number Diff line number Diff line change @@ -243,14 +243,18 @@ void CDockWidget::setToggleViewActionChecked(bool Checked)
243
243
void CDockWidget::setWidget (QWidget* widget, eInsertMode InsertMode)
244
244
{
245
245
QScrollArea* ScrollAreaWidget = qobject_cast<QScrollArea*>(widget);
246
- if (ScrollAreaWidget || ForceNoScrollArea ! = InsertMode)
246
+ if (ScrollAreaWidget || ForceNoScrollArea = = InsertMode)
247
247
{
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
+ }
250
253
}
251
254
else
252
255
{
253
- d->Layout ->addWidget (widget);
256
+ d->setupScrollArea ();
257
+ d->ScrollArea ->setWidget (widget);
254
258
}
255
259
256
260
d->Widget = widget;
You can’t perform that action at this time.
0 commit comments