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

macOS: Don't show QMessageBox::about(Qt) as modal windows

Browse Source 
The system behavior is to not show these kinds of dialogs as modal,
and we've documented that for QMessageBox.

However, calling show() instead of exec() is not enough, as the
default constructor of QMessageBox will set the modality of the
widget to application-modal. We need to explicitly override this.

[ChangLog][macOS] QMessageBox::about(Qt) now shows dialog non-modal,
as documented.

Pick-to: 6.2
Change-Id: I6bb59efb81feb23122276a9eede71b2f20c9d7c6
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
This commit is contained in:
Tor Arne Vestbø 2021-09-03 19:58:21 +02:00
parent 3a9b5162e6
commit aafed07dee
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/widgets/dialogs/qmessagebox.cpp
View File

@ -1830,6 +1830,7 @@ void QMessageBox::about(QWidget *parent, const QString &title, const QString &te
#else #else
msgBox->d_func()->buttonBox->setCenterButtons(true); msgBox->d_func()->buttonBox->setCenterButtons(true);
#endif #endif
msgBox->setModal(false);
msgBox->show(); msgBox->show();
#else #else
msgBox->exec(); msgBox->exec();
@ -1915,6 +1916,7 @@ void QMessageBox::aboutQt(QWidget *parent, const QString &title)
#else #else
msgBox->d_func()->buttonBox->setCenterButtons(true); msgBox->d_func()->buttonBox->setCenterButtons(true);
#endif #endif
msgBox->setModal(false);
msgBox->show(); msgBox->show();
#else #else
msgBox->exec(); msgBox->exec();

13
tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp
View File

@ -127,11 +127,20 @@ void ExecCloseHelper::timerEvent(QTimerEvent *te)
return; return;
QWidget *modalWidget = QApplication::activeModalWidget(); QWidget *modalWidget = QApplication::activeModalWidget();
if (!m_testCandidate && modalWidget) if (!m_testCandidate && modalWidget)
m_testCandidate = modalWidget; m_testCandidate = modalWidget;
if (m_testCandidate && m_testCandidate == modalWidget) { QWidget *activeWindow = QApplication::activeWindow();
if (!m_testCandidate && activeWindow)
m_testCandidate = activeWindow;
if (!m_testCandidate)
return;
bool shouldHelp = (m_testCandidate->isModal() && m_testCandidate == modalWidget)
|| (!m_testCandidate->isModal() && m_testCandidate == activeWindow);
if (shouldHelp) {
if (m_key == CloseWindow) { if (m_key == CloseWindow) {
m_testCandidate->close(); m_testCandidate->close();
} else { } else {