feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

LanguageClient: fix show message box

Browse Source 
Add a default close button and connect all language server defined
buttons to accepted, so the message box gets closed when the user
presses a button.

Change-Id: I846eadf5953e75441bdc7910c2587a2fa098a388
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
This commit is contained in:
David Schulz
2023-03-20 11:42:41 +01:00
parent 7d4f123842
commit 6dcc1771e3
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/languageclient/client.cpp
View File

@@ -1669,10 +1669,15 @@ LanguageClientValue<MessageActionItem> ClientPrivate::showMessageBox(
} }
QHash<QAbstractButton *, MessageActionItem> itemForButton; QHash<QAbstractButton *, MessageActionItem> itemForButton;
if (const std::optional<QList<MessageActionItem>> actions = message.actions()) { if (const std::optional<QList<MessageActionItem>> actions = message.actions()) {
for (const MessageActionItem &action : *actions) auto button = box->addButton(QMessageBox::Close);
itemForButton.insert(box->addButton(action.title(), QMessageBox::InvalidRole), action); connect(button, &QPushButton::clicked, box, &QMessageBox::reject);
for (const MessageActionItem &action : *actions) {
connect(button, &QPushButton::clicked, box, &QMessageBox::accept);
itemForButton.insert(button, action);
} }
box->exec(); }
if (box->exec() == QDialog::Rejected)
return {};
const MessageActionItem &item = itemForButton.value(box->clickedButton()); const MessageActionItem &item = itemForButton.value(box->clickedButton());
return item.isValid() ? LanguageClientValue<MessageActionItem>(item) return item.isValid() ? LanguageClientValue<MessageActionItem>(item)
: LanguageClientValue<MessageActionItem>(); : LanguageClientValue<MessageActionItem>();