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

Revert "Fix crash when restoring state"

Browse Source 
This reverts commit ee97b03e53.
This commit is contained in:
Syarif Fakhri 2022-09-14 12:32:32 +08:00
parent ee97b03e53
commit 6b85b2b505
3 changed files with 4 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/DockContainerWidget.cpp
View File

@ -1666,7 +1666,6 @@ void CDockContainerWidget::removeDockArea(CDockAreaWidget* area)
CDockWidget::emitTopLevelEventForWidget(TopLevelWidget, true); CDockWidget::emitTopLevelEventForWidget(TopLevelWidget, true);
dumpLayout(); dumpLayout();
d->emitDockAreasRemoved(); d->emitDockAreasRemoved();
area->overlayDockContainer()->clearDockArea();
area->setOverlayDockContainer(nullptr); area->setOverlayDockContainer(nullptr);
area->updateAutoHideButtonCheckState(); area->updateAutoHideButtonCheckState();
area->updateTitleBarButtonToolTip(); area->updateTitleBarButtonToolTip();

34
src/OverlayDockContainer.cpp
View File

@ -158,11 +158,6 @@ COverlayDockContainer::COverlayDockContainer(CDockManager* DockManager, CDockWid
//============================================================================ //============================================================================
void COverlayDockContainer::updateMask() void COverlayDockContainer::updateMask()
{ {
if (d->DockArea == nullptr)
{
return;
}
const auto rect = d->DockArea->frameGeometry(); const auto rect = d->DockArea->frameGeometry();
const auto topLeft = rect.topLeft(); const auto topLeft = rect.topLeft();
const auto handleSize = d->Splitter->handleWidth(); const auto handleSize = d->Splitter->handleWidth();
@ -227,8 +222,6 @@ CDockWidget* COverlayDockContainer::dockWidget() const
//============================================================================ //============================================================================
void COverlayDockContainer::addDockWidget(CDockWidget* DockWidget) void COverlayDockContainer::addDockWidget(CDockWidget* DockWidget)
{ {
Q_ASSERT_X(d->DockArea != nullptr, "COverlayDockContainer::addDockWidget", "You should not be using the overlay dock container after the dock area is set to nullptr.");
if (d->DockWidget) if (d->DockWidget)
{ {
// Remove the old dock widget at this area // Remove the old dock widget at this area
@ -391,26 +384,14 @@ void COverlayDockContainer::collapseView(bool Enable)
if (Enable) if (Enable)
{ {
hide(); hide();
if (d->DockArea) d->DockArea->hide();
{ d->DockWidget->hide();
d->DockArea->hide();
}
if (d->DockWidget)
{
d->DockWidget->hide();
}
} }
else else
{ {
show(); show();
if (d->DockArea) d->DockArea->show();
{ d->DockWidget->show();
d->DockArea->show();
}
if (d->DockWidget)
{
d->DockWidget->show();
}
} }
} }
@ -438,13 +419,6 @@ bool COverlayDockContainer::areaExistsInConfig(CDockWidgetSideTab::SideTabBarAre
} }
//============================================================================
void COverlayDockContainer::clearDockArea()
{
d->DockArea = nullptr;
}
//============================================================================ //============================================================================
bool COverlayDockContainer::eventFilter(QObject* watched, QEvent* event) bool COverlayDockContainer::eventFilter(QObject* watched, QEvent* event)
{ {

6
src/OverlayDockContainer.h
View File

@ -150,12 +150,6 @@ public:
* Convenience function fr determining if area exists in config * Convenience function fr determining if area exists in config
*/ */
static bool areaExistsInConfig(CDockWidgetSideTab::SideTabBarArea area); static bool areaExistsInConfig(CDockWidgetSideTab::SideTabBarArea area);
/**
* Sets internal DockArea to nullptr
* Called when removing the dock area from this overlay widget
*/
void clearDockArea();
}; };
} }