whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QMessageBox: Resolve button title from button role if title is empty 

Our tst_QMessageBox tests exhibits many cases of adding a button
to a message box without a specific title, e.g.:

  QPushButton *button = new QPushButton;
  msgBox.addButton(button, QMessageBox::DestructiveRole);

This results in buttons without a title, which for a native backend
may be an error. We mitigate the issue by resolving a default button
title based on its role.

Change-Id: Ib8a15818a83021771793ea85a5f782690fe677ec
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
bb10
Tor Arne Vestbø 2022-11-14 22:08:58 +01:00
parent 27f0854813
commit 5827ee5ffc
1 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,6 +28,7 @@
#include <QtGui/qfontmetrics.h>
#include <QtGui/qclipboard.h>
#include "private/qabstractbutton_p.h"
#include <QtGui/qpa/qplatformtheme.h>
#ifdef Q_OS_WIN
# include <QtCore/qt_windows.h>
@ -203,6 +204,7 @@ public:
QMessageBox::StandardButtons buttons, QMessageBox::StandardButton defaultButton);
static QPixmap standardIcon(QMessageBox::Icon icon, QMessageBox *mb);
static QMessageBox::StandardButton standardButtonForRole(QMessageBox::ButtonRole role);
QLabel *label;
QMessageBox::Icon icon;
@ -843,6 +845,19 @@ void QMessageBox::addButton(QAbstractButton *button, ButtonRole role)
if (!button)
return;
removeButton(button);
if (button->text().isEmpty()) {
if (auto *platformTheme = QGuiApplicationPrivate::platformTheme()) {
if (auto standardButton = QMessageBoxPrivate::standardButtonForRole(role))
button->setText(platformTheme->standardButtonText(standardButton));
}
if (button->text().isEmpty()) {
qWarning() << "Cannot add" << button << "without title";
return;
}
}
// Add button to native dialog helper, unless it's the details button,
// since we don't do any plumbing for the button's action in that case.
if (button != d->detailsButton) {
@ -854,6 +869,21 @@ void QMessageBox::addButton(QAbstractButton *button, ButtonRole role)
d->autoAddOkButton = false;
}
QMessageBox::StandardButton QMessageBoxPrivate::standardButtonForRole(QMessageBox::ButtonRole role)
{
switch (role) {
case QMessageBox::AcceptRole: return QMessageBox::Ok;
case QMessageBox::RejectRole: return QMessageBox::Cancel;
case QMessageBox::DestructiveRole: return QMessageBox::Discard;
case QMessageBox::HelpRole: return QMessageBox::Help;
case QMessageBox::ApplyRole: return QMessageBox::Apply;
case QMessageBox::YesRole: return QMessageBox::Yes;
case QMessageBox::NoRole: return QMessageBox::No;
case QMessageBox::ResetRole: return QMessageBox::Reset;
default: return QMessageBox::NoButton;
}
}
/*!
\since 4.2
\overload