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

QMessageBox: Fall back to non-native dialog if button has menu

Browse Source 
There's no plumbing in QMessageDialogOptions for supporting
native dialog buttons with menus, and even if there was such
plumbing, we don't know if our native dialogs could support
them.

As a workaround, detect the situation and automatically fall
back to the non-native dialog, so the user doesn't need to
set Qt::AA_DontUseNativeDialogs explicitly.

Fixes: QTBUG-118419
Change-Id: Iece7012909261b8869ce0ca23e45e8daaf4babc7
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
This commit is contained in:
Timur Pocheptsov 2023-10-20 14:54:06 +02:00 committed by Tor Arne Vestbø
parent 9c8651478b
commit 2d59f2e8ca
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2824,6 +2824,14 @@ bool QMessageBoxPrivate::canBeNativeDialog() const
if (strcmp(QMessageBox::staticMetaObject.className(), q->metaObject()->className()) != 0) if (strcmp(QMessageBox::staticMetaObject.className(), q->metaObject()->className()) != 0)
return false; return false;
for (auto *customButton : customButtonList) {
if (QPushButton *pushButton = qobject_cast<QPushButton *>(customButton)) {
// We can't support buttons with menus in native dialogs (yet)
if (pushButton->menu())
return false;
}
}
return QDialogPrivate::canBeNativeDialog(); return QDialogPrivate::canBeNativeDialog();
} }