mirrors/Qt-Advanced-Docking-System
1
0
Fork 0
mirror of https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System.git synced 2025-04-16 10:24:45 +08:00
Code

- Fix crash caused by not removing dock area from parent container

Browse Source 
- Fix strange behavior caused by not calling QSplitter::resizeEvent base
implementation
This commit is contained in:
Syarif Fakhri 2022-10-03 17:29:56 +08:00
parent 53e8010732
commit 3cd0265df6
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/OverlayDockContainer.cpp
View File

@ -204,7 +204,6 @@ void COverlayDockContainer::updateSize()
const auto rect = rootSplitter->frameGeometry(); const auto rect = rootSplitter->frameGeometry();
move(rect.topLeft()); move(rect.topLeft());
resize(rect.width(), rect.height()); resize(rect.width(), rect.height());
d->DockArea->updateGeometry();
} }
//============================================================================ //============================================================================
@ -313,6 +312,8 @@ CDockAreaWidget* COverlayDockContainer::dockAreaWidget() const
//============================================================================ //============================================================================
void COverlayDockContainer::moveContentsToParent() void COverlayDockContainer::moveContentsToParent()
{ {
cleanupAndDelete();
const auto position = mapToGlobal(d->getSimplifiedDockAreaPosition()); const auto position = mapToGlobal(d->getSimplifiedDockAreaPosition());
const auto dockAreaWidget = parentContainer()->dockAreaAt(position); const auto dockAreaWidget = parentContainer()->dockAreaAt(position);
@ -324,7 +325,8 @@ void COverlayDockContainer::moveContentsToParent()
{ {
parentContainer()->addDockWidget(d->getArea(d->Area), d->DockWidget); parentContainer()->addDockWidget(d->getArea(d->Area), d->DockWidget);
} }
cleanupAndDelete();
parentContainer()->removeDockArea(d->DockArea);
} }
@ -457,14 +459,15 @@ bool COverlayDockContainer::eventFilter(QObject* watched, QEvent* event)
updateSize(); updateSize();
updateMask(); updateMask();
} }
return QWidget::eventFilter(watched, event);
return QSplitter::eventFilter(watched, event);
} }
//============================================================================ //============================================================================
void COverlayDockContainer::mousePressEvent(QMouseEvent* event) void COverlayDockContainer::mousePressEvent(QMouseEvent* event)
{ {
QWidget::mousePressEvent(event); QSplitter::mousePressEvent(event);
} }
@ -472,7 +475,7 @@ void COverlayDockContainer::mousePressEvent(QMouseEvent* event)
void COverlayDockContainer::resizeEvent(QResizeEvent* event) void COverlayDockContainer::resizeEvent(QResizeEvent* event)
{ {
updateMask(); updateMask();
QWidget::resizeEvent(event); QSplitter::resizeEvent(event);
} }
} }