philipp/KDDockWidgets
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '1.2'

Browse Source
This commit is contained in:
Sergio Martins
2021-02-05 16:42:07 +00:00
parent 697417b906 621c3dbeca
commit 38443048b8
8 changed files with 67 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/MainWindowBase.cpp
View File

@@ -489,16 +489,25 @@ void MainWindowBase::toggleOverlayOnSideBar(DockWidgetBase *dw)
}
}
void MainWindowBase::clearSideBarOverlay()
void MainWindowBase::clearSideBarOverlay(bool deleteFrame)
{
if (!d->m_overlayedDockWidget)
return;
Frame *frame = d->m_overlayedDockWidget->frame();
d->m_overlayedDockWidget->setParent(nullptr);
Q_EMIT d->m_overlayedDockWidget->isOverlayedChanged(false);
d->m_overlayedDockWidget = nullptr;
delete frame;
frame->unoverlay();
if (deleteFrame) {
d->m_overlayedDockWidget->setParent(nullptr);
Q_EMIT d->m_overlayedDockWidget->isOverlayedChanged(false);
d->m_overlayedDockWidget = nullptr;
delete frame;
} else {
// No cleanup, just unset. When we drag the overlay it becomes a normal floating window
// meaning we reuse Frame. Don't delete it.
Q_EMIT d->m_overlayedDockWidget->isOverlayedChanged(false);
d->m_overlayedDockWidget = nullptr;
}
}
SideBar *MainWindowBase::sideBarForDockWidget(const DockWidgetBase *dw) const