Merge pull request #8280 from CookiePLMonster/alert-msg-box-modality-fix

Make alert messages application modal and not window modal
This commit is contained in:
Connor McLaughlin
2019-08-20 10:58:57 +10:00
committed by GitHub
3 changed files with 4 additions and 4 deletions

View File

@ -6,10 +6,10 @@
#include <QApplication>
ModalMessageBox::ModalMessageBox(QWidget* parent)
ModalMessageBox::ModalMessageBox(QWidget* parent, Qt::WindowModality modality)
: QMessageBox(parent != nullptr ? parent->window() : nullptr)
{
setWindowModality(Qt::WindowModal);
setWindowModality(modality);
setWindowFlags(Qt::Sheet | Qt::WindowTitleHint | Qt::CustomizeWindowHint);
// No parent is still preferable to showing a hidden parent here.

View File

@ -10,7 +10,7 @@
class ModalMessageBox : public QMessageBox
{
public:
explicit ModalMessageBox(QWidget* parent);
explicit ModalMessageBox(QWidget* parent, Qt::WindowModality modality = Qt::WindowModal);
static int critical(QWidget* parent, const QString& title, const QString& text,
StandardButtons buttons = Ok, StandardButton default_button = NoButton);