mirrors/Qt-Advanced-Docking-System
1
0
Fork 0
mirror of https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System.git synced 2024-11-15 21:25:44 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed setWidget function of DockWidget to properly setup the internal scroll area

Browse Source
This commit is contained in:
Uwe Kindler 2019-05-10 10:32:06 +02:00
parent 9b56ca08e1
commit 1fccb943fe
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/DockWidget.cpp
View File

@ -243,14 +243,18 @@ void CDockWidget::setToggleViewActionChecked(bool Checked)
void CDockWidget::setWidget(QWidget* widget, eInsertMode InsertMode) void CDockWidget::setWidget(QWidget* widget, eInsertMode InsertMode)
{ {
QScrollArea* ScrollAreaWidget = qobject_cast<QScrollArea*>(widget); QScrollArea* ScrollAreaWidget = qobject_cast<QScrollArea*>(widget);
if (ScrollAreaWidget || ForceNoScrollArea != InsertMode) if (ScrollAreaWidget || ForceNoScrollArea == InsertMode)
{ {
d->setupScrollArea(); d->Layout->addWidget(widget);
d->ScrollArea->setWidget(widget); if (ScrollAreaWidget && ScrollAreaWidget->viewport())
{
ScrollAreaWidget->viewport()->setProperty("dockWidgetContent", true);
}
} }
else else
{ {
d->Layout->addWidget(widget); d->setupScrollArea();
d->ScrollArea->setWidget(widget);
} }
d->Widget = widget; d->Widget = widget;