ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7875 from spycrab/qt_msgbox_fixes 

ModalMessageBox: Remove superfluous buttons and ensure correct parent
This commit is contained in:
spycrab 2019-03-11 19:36:19 +01:00 committed by GitHub
parent 9e4ab87a34 63fd931245
commit 909e9322e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/Core/DolphinQt/QtUtils/ModalMessageBox.cpp
View File

@ -6,13 +6,14 @@
#include <QApplication> #include <QApplication>
ModalMessageBox::ModalMessageBox(QWidget* parent) : QMessageBox(parent) ModalMessageBox::ModalMessageBox(QWidget* parent)
: QMessageBox(parent != nullptr ? parent->window() : nullptr)
{ {
setWindowModality(Qt::WindowModal); setWindowModality(Qt::WindowModal);
setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); setWindowFlags(Qt::Sheet | Qt::WindowTitleHint | Qt::CustomizeWindowHint);
// No parent is still preferable to showing a hidden parent here. // No parent is still preferable to showing a hidden parent here.
if (parent != nullptr && !parent->isVisible()) if (parent != nullptr && !parent->window()->isVisible())
setParent(nullptr); setParent(nullptr);
} }