AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Call QWidget close handling in QWidget::close for non-toplevel native widgets

Browse Source 
Since commit 7ba75d0 we close the QWindow in QWidget::close for native
widgets and trigger the closeEvent in QWidgetWindow. However, if the
widget's window handle is not a top level window, QWindow::close()
will not close the window, failing in this way to deliver the
closeEvent and call the close handling in QWidgetPrivate::handleClose.
To fix, call handleClose() from QWidget::close for such widgets.

Task-number: QTBUG-74606
Pick-to: 6.2
Change-Id: Ied342eced3340aaf19b5443762935b1a5fc5c27b
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
This commit is contained in:
Doris Verria 2021-10-13 13:35:10 +02:00
parent dcb281af7d
commit ec09900997
3 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/kernel/qwindow.cpp
View File

@ -2258,7 +2258,7 @@ bool QWindow::close()
Q_D(QWindow);
// Do not close non top level windows
if (parent())
if (!isTopLevel())
return false;
if (!d->platformWindow)

6
src/widgets/kernel/qwidget.cpp
View File

@ -8466,8 +8466,10 @@ bool QWidgetPrivate::close()
// Close native widgets via QWindow::close() in order to run QWindow
// close code. The QWidget-specific close code in handleClose() will
// in this case be called from the Close event handler in QWidgetWindow.
if (QWindow *widgetWindow = windowHandle())
return widgetWindow->close();
if (QWindow *widgetWindow = windowHandle()) {
if (widgetWindow->isTopLevel())
return widgetWindow->close();
}
return handleClose(QWidgetPrivate::CloseWithEvent);
}

20
tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
View File

@ -243,6 +243,7 @@ private slots:
void winIdChangeEvent();
void persistentWinId();
void showNativeChild();
void closeAndShowNativeChild();
void closeAndShowWithNativeChild();
void transientParent();
void qobject_castInDestroyedSlot();
@ -4776,6 +4777,25 @@ void tst_QWidget::showNativeChild()
QVERIFY(QTest::qWaitForWindowExposed(&topLevel));
}
void tst_QWidget::closeAndShowNativeChild()
{
QWidget topLevel;
QWidget *nativeChild = new QWidget;
nativeChild->winId();
nativeChild->setFixedSize(200, 200);
QHBoxLayout *layout = new QHBoxLayout;
layout->addWidget(nativeChild);
topLevel.setLayout(layout);
topLevel.show();
QVERIFY(!nativeChild->isHidden());
nativeChild->close();
QVERIFY(nativeChild->isHidden());
nativeChild->show();
QVERIFY(!nativeChild->isHidden());
}
void tst_QWidget::closeAndShowWithNativeChild()
{
bool dontCreateNativeWidgetSiblings = QApplication::testAttribute(Qt::AA_DontCreateNativeWidgetSiblings);