diff options
author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2021-09-03 15:07:21 +0200 |
---|---|---|
committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2021-09-16 14:24:00 +0200 |
commit | 0246bfd40a2cc5ea9cfc035146e6dd865b334c68 (patch) | |
tree | 1a8eb37fc4864d01336b44a3073830cb8f26665b /src/widgets/dialogs/qmessagebox.cpp | |
parent | 8aa1fc6f12858ad6f786a4a971a5758fa28d3686 (diff) |
Close QDialog via QWidget::close()
By going via QWidget::close() we ensure that if there's a QWidgetWindow
backing the dialog (which is almost always the case), we will plumb down
to QWindow::close(), resulting in QEvent::Close events to the QWindow.
Since we don't want QDialog subclasses to receive a call to a closeEvent
override that they didn't receive before (and which they might interpret
as rejection or cancellation), install a temporary event filter that
eats the QCloseEvent resulting from the call to close().
Task-number: QTBUG-53286
Change-Id: Ie8f6f0cb3160acfd5865dc74f0a7b6d87f838724
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src/widgets/dialogs/qmessagebox.cpp')
-rw-r--r-- | src/widgets/dialogs/qmessagebox.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/widgets/dialogs/qmessagebox.cpp b/src/widgets/dialogs/qmessagebox.cpp index ac2f8bd2d5..a3093f82c2 100644 --- a/src/widgets/dialogs/qmessagebox.cpp +++ b/src/widgets/dialogs/qmessagebox.cpp @@ -518,7 +518,7 @@ void QMessageBoxPrivate::setClickedButton(QAbstractButton *button) emit q->buttonClicked(clickedButton); auto resultCode = execReturnCode(button); - hide(resultCode); + close(resultCode); finalize(resultCode, dialogCodeForButton(button)); } @@ -1420,8 +1420,10 @@ void QMessageBox::closeEvent(QCloseEvent *e) return; } QDialog::closeEvent(e); - d->clickedButton = d->detectedEscapeButton; - setResult(d->execReturnCode(d->detectedEscapeButton)); + if (!d->clickedButton) { + d->clickedButton = d->detectedEscapeButton; + setResult(d->execReturnCode(d->detectedEscapeButton)); + } } /*! |