1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QMainWindowTabBar: Add destructor

Browse Source 
QMainWindowLayout re-uses tab bars. A QSet and a QList member are kept,
to track used and unused tab bars.

Corner cases upon application close down leave dangling pointers in
those containers.

=> Add a destructor to QMainWindowTabBar
=> remove the tab bar from used and unused tab bar containers, if
not directly parented to the main window.

=> No longer reparent unused tab bars of a QDockWidgetGroupWindow
to the main window. Let them be destroyed as a group window child,
and its destructor remove it from the used/unused tab bar container.

Pick-to: 6.5
Change-Id: If2388cf878553dc89583dbc8585748fad65bbab2
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit b6b489db6968fbc3b4aab3755d0166ee09712ff0)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Axel Spoerl 2023-11-17 11:12:26 +01:00 committed by Qt Cherry-pick Bot
parent 80925cf84f
commit 36fadb4c13
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/widgets/widgets/qmainwindowlayout.cpp
View File

@ -448,11 +448,6 @@ void QDockWidgetGroupWindow::destroyOrHideIfEmpty()
if (!wasHidden) if (!wasHidden)
dw->show(); dw->show();
} }
#if QT_CONFIG(tabbar)
const auto tabBars = findChildren<QTabBar *>(Qt::FindDirectChildrenOnly);
for (QTabBar *tb : tabBars)
tb->setParent(parentWidget());
#endif
deleteLater(); deleteLater();
} }
@ -1776,6 +1771,7 @@ class QMainWindowTabBar : public QTabBar
{ {
QMainWindow *mainWindow; QMainWindow *mainWindow;
QPointer<QDockWidget> draggingDock; // Currently dragging (detached) dock widget QPointer<QDockWidget> draggingDock; // Currently dragging (detached) dock widget
~QMainWindowTabBar();
public: public:
QMainWindowTabBar(QMainWindow *parent); QMainWindowTabBar(QMainWindow *parent);
protected: protected:
@ -1841,6 +1837,21 @@ void QMainWindowTabBar::mouseMoveEvent(QMouseEvent *e)
QTabBar::mouseMoveEvent(e); QTabBar::mouseMoveEvent(e);
} }
QMainWindowTabBar::~QMainWindowTabBar()
{
if (!mainWindow || mainWindow == parentWidget())
return;
// tab bar is not parented to the main window
// => can only be a dock widget group window
// => remove itself from used and unused tab bar containers
auto *mwLayout = qt_mainwindow_layout(mainWindow);
if (!mwLayout)
return;
mwLayout->unusedTabBars.removeOne(this);
mwLayout->usedTabBars.remove(this);
}
void QMainWindowTabBar::mouseReleaseEvent(QMouseEvent *e) void QMainWindowTabBar::mouseReleaseEvent(QMouseEvent *e)
{ {
if (draggingDock && e->button() == Qt::LeftButton) { if (draggingDock && e->button() == Qt::LeftButton) {