octo
/
yuzu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #9477 from Morph1984/overlaydialog 

overlay_dialog: Hide button dialog box when both buttons are hidden
This commit is contained in:
liamwhite 2022-12-19 09:22:56 -05:00 committed by GitHub
parent fcc93a445f 690a4c9438
commit 864c8e4b2f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/yuzu/util/overlay_dialog.cpp
View File

@ -42,7 +42,7 @@ OverlayDialog::OverlayDialog(QWidget* parent, Core::System& system, const QStrin
MoveAndResizeWindow(); MoveAndResizeWindow();
// TODO (Morph): Remove this when InputInterpreter no longer relies on the HID backend // TODO (Morph): Remove this when InputInterpreter no longer relies on the HID backend
if (system.IsPoweredOn()) { if (system.IsPoweredOn() && !ui->buttonsDialog->isHidden()) {
input_interpreter = std::make_unique<InputInterpreter>(system); input_interpreter = std::make_unique<InputInterpreter>(system);
StartInputThread(); StartInputThread();
@ -83,6 +83,11 @@ void OverlayDialog::InitializeRegularTextDialog(const QString& title_text, const
ui->button_ok_label->setEnabled(false); ui->button_ok_label->setEnabled(false);
} }
if (ui->button_cancel->isHidden() && ui->button_ok_label->isHidden()) {
ui->buttonsDialog->hide();
return;
}
connect( connect(
ui->button_cancel, &QPushButton::clicked, this, ui->button_cancel, &QPushButton::clicked, this,
[this](bool) { [this](bool) {
@ -130,6 +135,11 @@ void OverlayDialog::InitializeRichTextDialog(const QString& title_text, const QS
ui->button_ok_rich->setEnabled(false); ui->button_ok_rich->setEnabled(false);
} }
if (ui->button_cancel_rich->isHidden() && ui->button_ok_rich->isHidden()) {
ui->buttonsRichDialog->hide();
return;
}
connect( connect(
ui->button_cancel_rich, &QPushButton::clicked, this, ui->button_cancel_rich, &QPushButton::clicked, this,
[this](bool) { [this](bool) {