VERY experimental Nintendo Switch 2 emulator
C++
main: Globally disable the "?" button on dialogs
Morphaeada1616aeb
diff --git a/src/yuzu/configuration/configure_dialog.cpp b/src/yuzu/configuration/configure_dialog.cppindex 4301313cfd..2aaefcc058 100644--- a/src/yuzu/configuration/configure_dialog.cpp+++ b/src/yuzu/configuration/configure_dialog.cpp@@ -66,7 +66,6 @@ ConfigureDialog::ConfigureDialog(QWidget* parent, HotkeyRegistry& registry_,web_tab->SetWebServiceConfigEnabled(enable_web_config);hotkeys_tab->Populate(registry);- setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);input_tab->Initialize(input_subsystem);diff --git a/src/yuzu/configuration/configure_motion_touch.cpp b/src/yuzu/configuration/configure_motion_touch.cppindex d1b870c729..fb1292f07a 100644--- a/src/yuzu/configuration/configure_motion_touch.cpp+++ b/src/yuzu/configuration/configure_motion_touch.cpp@@ -89,7 +89,6 @@ ConfigureMotionTouch::ConfigureMotionTouch(QWidget* parent,"using-a-controller-or-android-phone-for-motion-or-touch-input'><span ""style=\"text-decoration: underline; color:#039be5;\">Learn More</span></a>"));- setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);SetConfiguration();UpdateUiDisplay();ConnectEvents();diff --git a/src/yuzu/configuration/configure_per_game.cpp b/src/yuzu/configuration/configure_per_game.cppindex 93db47cfd0..7e757eafd9 100644--- a/src/yuzu/configuration/configure_per_game.cpp+++ b/src/yuzu/configuration/configure_per_game.cpp@@ -66,8 +66,6 @@ ConfigurePerGame::ConfigurePerGame(QWidget* parent, u64 title_id_, const std::stsetFocusPolicy(Qt::ClickFocus);setWindowTitle(tr("Properties"));- // remove Help question mark button from the title bar- setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);addons_tab->SetTitleId(title_id);diff --git a/src/yuzu/configuration/configure_tas.cpp b/src/yuzu/configuration/configure_tas.cppindex 1edc5f1f30..5a545aa706 100644--- a/src/yuzu/configuration/configure_tas.cpp+++ b/src/yuzu/configuration/configure_tas.cpp@@ -17,7 +17,6 @@ ConfigureTasDialog::ConfigureTasDialog(QWidget* parent)setFocusPolicy(Qt::ClickFocus);setWindowTitle(tr("TAS Configuration"));- setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);connect(ui->tas_path_button, &QToolButton::pressed, this,[this] { SetDirectory(DirectoryTarget::TAS, ui->tas_path_edit); });diff --git a/src/yuzu/debugger/controller.cpp b/src/yuzu/debugger/controller.cppindex 19f3775a3e..e2f55ebae1 100644--- a/src/yuzu/debugger/controller.cpp+++ b/src/yuzu/debugger/controller.cpp@@ -20,9 +20,8 @@ ControllerDialog::ControllerDialog(Core::HID::HIDCore& hid_core_,setWindowTitle(tr("Controller P1"));resize(500, 350);setMinimumSize(500, 350);- // Remove the "?" button from the titlebar and enable the maximize button- setWindowFlags((windowFlags() & ~Qt::WindowContextHelpButtonHint) |- Qt::WindowMaximizeButtonHint);+ // Enable the maximize button+ setWindowFlags(windowFlags() | Qt::WindowMaximizeButtonHint);widget = new PlayerControlPreview(this);refreshConfiguration();diff --git a/src/yuzu/debugger/profiler.cpp b/src/yuzu/debugger/profiler.cppindex d3e2d3c122..493ee0b178 100644--- a/src/yuzu/debugger/profiler.cpp+++ b/src/yuzu/debugger/profiler.cpp@@ -49,9 +49,8 @@ MicroProfileDialog::MicroProfileDialog(QWidget* parent) : QWidget(parent, Qt::DisetObjectName(QStringLiteral("MicroProfile"));setWindowTitle(tr("&MicroProfile"));resize(1000, 600);- // Remove the "?" button from the titlebar and enable the maximize button- setWindowFlags((windowFlags() & ~Qt::WindowContextHelpButtonHint) |- Qt::WindowMaximizeButtonHint);+ // Enable the maximize button+ setWindowFlags(windowFlags() | Qt::WindowMaximizeButtonHint);#if MICROPROFILE_ENABLEDdiff --git a/src/yuzu/install_dialog.cpp b/src/yuzu/install_dialog.cppindex 84ec4fe13d..673bbaa836 100644--- a/src/yuzu/install_dialog.cpp+++ b/src/yuzu/install_dialog.cpp@@ -46,7 +46,6 @@ InstallDialog::InstallDialog(QWidget* parent, const QStringList& files) : QDialovbox_layout->addLayout(hbox_layout);setLayout(vbox_layout);- setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);setWindowTitle(tr("Install Files to NAND"));}diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cppindex 571eacf9f4..3fba802afe 100644--- a/src/yuzu/main.cpp+++ b/src/yuzu/main.cpp@@ -2758,8 +2758,7 @@ void GMainWindow::OnMenuInstallToNAND() {ui->action_Install_File_NAND->setEnabled(false);install_progress = new QProgressDialog(QString{}, tr("Cancel"), 0, total_size, this);- install_progress->setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint &- ~Qt::WindowMaximizeButtonHint);+ install_progress->setWindowFlags(windowFlags() & ~Qt::WindowMaximizeButtonHint);install_progress->setAttribute(Qt::WA_DeleteOnClose, true);install_progress->setFixedWidth(installDialog.GetMinimumWidth() + 40);install_progress->show();@@ -4456,6 +4455,9 @@ int main(int argc, char* argv[]) {}#endif+ // Disables the "?" button on all dialogs.+ QCoreApplication::setAttribute(Qt::AA_DisableWindowContextHelpButton);+// Enables the core to make the qt created contexts current on std::threadsQCoreApplication::setAttribute(Qt::AA_DontCheckOpenGLContextThreadAffinity);QApplication app(argc, argv);diff --git a/src/yuzu/util/limitable_input_dialog.cpp b/src/yuzu/util/limitable_input_dialog.cppindex bbb370595b..5f6a9c1934 100644--- a/src/yuzu/util/limitable_input_dialog.cpp+++ b/src/yuzu/util/limitable_input_dialog.cpp@@ -16,8 +16,6 @@ LimitableInputDialog::LimitableInputDialog(QWidget* parent) : QDialog{parent} {LimitableInputDialog::~LimitableInputDialog() = default;void LimitableInputDialog::CreateUI() {- setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);-text_label = new QLabel(this);text_entry = new QLineEdit(this);text_label_invalid = new QLabel(this);diff --git a/src/yuzu/util/sequence_dialog/sequence_dialog.cpp b/src/yuzu/util/sequence_dialog/sequence_dialog.cppindex 4b10fa517e..1670aa596a 100644--- a/src/yuzu/util/sequence_dialog/sequence_dialog.cpp+++ b/src/yuzu/util/sequence_dialog/sequence_dialog.cpp@@ -8,7 +8,6 @@SequenceDialog::SequenceDialog(QWidget* parent) : QDialog(parent) {setWindowTitle(tr("Enter a hotkey"));- setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);key_sequence = new QKeySequenceEdit;