mirrors/Qt-Advanced-Docking-System
1
0
Fork 0
mirror of https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System.git synced 2025-01-12 16:20:25 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed takeWidget() function and fixed setWidget() function to handle case if there is already a content widget

Browse Source
This commit is contained in:
Uwe Kindler 2020-04-09 21:44:21 +02:00
parent 9fe1dd6a88
commit 7a17aba42d
2 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
demo/MainWindow.cpp
View File

@ -169,7 +169,12 @@ static ads::CDockWidget* createCalendarDockWidget(QMenu* ViewMenu)
static int CalendarCount = 0; static int CalendarCount = 0;
QCalendarWidget* w = new QCalendarWidget(); QCalendarWidget* w = new QCalendarWidget();
ads::CDockWidget* DockWidget = new ads::CDockWidget(QString("Calendar %1").arg(CalendarCount++)); ads::CDockWidget* DockWidget = new ads::CDockWidget(QString("Calendar %1").arg(CalendarCount++));
// The following lines are for testing the setWidget() and takeWidget()
// functionality
DockWidget->setWidget(w); DockWidget->setWidget(w);
DockWidget->setWidget(w); // what happens if we set a widget if a widget is already set
DockWidget->takeWidget(); // we remove the widget
DockWidget->setWidget(w); // and set the widget again - there should be no error
DockWidget->setToggleViewActionMode(ads::CDockWidget::ActionModeShow); DockWidget->setToggleViewActionMode(ads::CDockWidget::ActionModeShow);
DockWidget->setIcon(svgIcon(":/adsdemo/images/date_range.svg")); DockWidget->setIcon(svgIcon(":/adsdemo/images/date_range.svg"));
ViewMenu->addAction(DockWidget->toggleViewAction()); ViewMenu->addAction(DockWidget->toggleViewAction());

29
src/DockWidget.cpp
View File

@ -257,6 +257,11 @@ void CDockWidget::setToggleViewActionChecked(bool Checked)
//============================================================================ //============================================================================
void CDockWidget::setWidget(QWidget* widget, eInsertMode InsertMode) void CDockWidget::setWidget(QWidget* widget, eInsertMode InsertMode)
{ {
if (d->Widget)
{
takeWidget();
}
QScrollArea* ScrollAreaWidget = qobject_cast<QScrollArea*>(widget); QScrollArea* ScrollAreaWidget = qobject_cast<QScrollArea*>(widget);
if (ScrollAreaWidget || ForceNoScrollArea == InsertMode) if (ScrollAreaWidget || ForceNoScrollArea == InsertMode)
{ {
@ -280,10 +285,26 @@ void CDockWidget::setWidget(QWidget* widget, eInsertMode InsertMode)
//============================================================================ //============================================================================
QWidget* CDockWidget::takeWidget() QWidget* CDockWidget::takeWidget()
{ {
d->ScrollArea->takeWidget(); QWidget* w = nullptr;
d->Layout->removeWidget(d->Widget); if (d->ScrollArea)
d->Widget->setParent(nullptr); {
return d->Widget; d->Layout->removeWidget(d->ScrollArea);
w = d->ScrollArea->takeWidget();
delete d->ScrollArea;
d->ScrollArea = nullptr;
}
else if (d->Widget)
{
d->Layout->removeWidget(d->Widget);
w = d->Widget;
d->Widget = nullptr;
}
if (w)
{
w->setParent(nullptr);
}
return w;
} }