Merge 75f00f756f into db7b106f1d

src/yuzu/configuration/configure_dialog.cpp

@@ -117,6 +117,14 @@ void ConfigureDialog::ApplyConfiguration() {
     Settings::LogSettings();
 }
 
+void ConfigureDialog::MainWindowFocusIn() {
+    input_tab->DisableConfiguration();
+}
+
+void ConfigureDialog::MainWindowFocusOut() {
+    input_tab->EnableConfiguration();
+}
+
 void ConfigureDialog::changeEvent(QEvent* event) {
     if (event->type() == QEvent::LanguageChange) {
         RetranslateUI();

src/yuzu/configuration/configure_dialog.h

@@ -46,6 +46,10 @@ public:
 
     void ApplyConfiguration();
 
+public slots:
+    void MainWindowFocusIn();
+    void MainWindowFocusOut();
+
 private slots:
     void OnLanguageChanged(const QString& locale);
 

src/yuzu/configuration/configure_input.cpp

@@ -181,6 +181,18 @@ void ConfigureInput::Initialize(InputCommon::InputSubsystem* input_subsystem,
     LoadConfiguration();
 }
 
+void ConfigureInput::EnableConfiguration() {
+    for (auto controller : player_controllers) {
+        controller->EnableConfiguration();
+    }
+}
+
+void ConfigureInput::DisableConfiguration() {
+    for (auto controller : player_controllers) {
+        controller->DisableConfiguration();
+    }
+}
+
 QList<QWidget*> ConfigureInput::GetSubTabs() const {
     return {
         ui->tabPlayer1, ui->tabPlayer2, ui->tabPlayer3, ui->tabPlayer4,  ui->tabPlayer5,

src/yuzu/configuration/configure_input.h

@@ -43,6 +43,12 @@ public:
     /// Initializes the input dialog with the given input subsystem.
     void Initialize(InputCommon::InputSubsystem* input_subsystem_, std::size_t max_players = 8);
 
+    /// Enables configuration on controllers
+    void EnableConfiguration();
+
+    /// Disables configuration on controllers
+    void DisableConfiguration();
+
     /// Save all button configurations to settings file.
     void ApplyConfiguration();
 

src/yuzu/configuration/configure_input_player.cpp

@@ -296,26 +296,7 @@ ConfigureInputPlayer::ConfigureInputPlayer(QWidget* parent, std::size_t player_i
       is_powered_on{is_powered_on_}, input_subsystem{input_subsystem_}, profiles(profiles_),
       timeout_timer(std::make_unique<QTimer>()),
       poll_timer(std::make_unique<QTimer>()), bottom_row{bottom_row_}, hid_core{hid_core_} {
-    if (player_index == 0) {
-        auto* emulated_controller_p1 =
-            hid_core.GetEmulatedController(Core::HID::NpadIdType::Player1);
-        auto* emulated_controller_handheld =
-            hid_core.GetEmulatedController(Core::HID::NpadIdType::Handheld);
-        emulated_controller_p1->SaveCurrentConfig();
-        emulated_controller_p1->EnableConfiguration();
-        emulated_controller_handheld->SaveCurrentConfig();
-        emulated_controller_handheld->EnableConfiguration();
-        if (emulated_controller_handheld->IsConnected(true)) {
-            emulated_controller_p1->Disconnect();
-            emulated_controller = emulated_controller_handheld;
-        } else {
-            emulated_controller = emulated_controller_p1;
-        }
-    } else {
-        emulated_controller = hid_core.GetEmulatedControllerByIndex(player_index);
-        emulated_controller->SaveCurrentConfig();
-        emulated_controller->EnableConfiguration();
-    }
+    EnableConfiguration();
     ui->setupUi(this);
 
     setFocusPolicy(Qt::ClickFocus);
@@ -805,6 +786,33 @@ ConfigureInputPlayer::ConfigureInputPlayer(QWidget* parent, std::size_t player_i
 }
 
 ConfigureInputPlayer::~ConfigureInputPlayer() {
+    DisableConfiguration();
+}
+
+void ConfigureInputPlayer::EnableConfiguration() {
+    if (player_index == 0) {
+        auto* emulated_controller_p1 =
+            hid_core.GetEmulatedController(Core::HID::NpadIdType::Player1);
+        auto* emulated_controller_handheld =
+            hid_core.GetEmulatedController(Core::HID::NpadIdType::Handheld);
+        emulated_controller_p1->SaveCurrentConfig();
+        emulated_controller_p1->EnableConfiguration();
+        emulated_controller_handheld->SaveCurrentConfig();
+        emulated_controller_handheld->EnableConfiguration();
+        if (emulated_controller_handheld->IsConnected(true)) {
+            emulated_controller_p1->Disconnect();
+            emulated_controller = emulated_controller_handheld;
+        } else {
+            emulated_controller = emulated_controller_p1;
+        }
+    } else {
+        emulated_controller = hid_core.GetEmulatedControllerByIndex(player_index);
+        emulated_controller->SaveCurrentConfig();
+        emulated_controller->EnableConfiguration();
+    }
+}
+
+void ConfigureInputPlayer::DisableConfiguration() {
     if (player_index == 0) {
         auto* emulated_controller_p1 =
             hid_core.GetEmulatedController(Core::HID::NpadIdType::Player1);

src/yuzu/configuration/configure_input_player.h

@@ -56,6 +56,12 @@ public:
                                   bool is_powered_on_, bool debug = false);
     ~ConfigureInputPlayer() override;
 
+    /// Enables configuration on controllers
+    void EnableConfiguration();
+
+    /// Disables configuration on controllers
+    void DisableConfiguration();
+
     /// Save all button configurations to settings file.
     void ApplyConfiguration();
 

src/yuzu/main.cpp

@@ -75,6 +75,7 @@ static FileSys::VirtualFile VfsDirectoryCreateFileWrapper(const FileSys::Virtual
 #include <QString>
 #include <QSysInfo>
 #include <QUrl>
+#include <QWindow>
 #include <QtConcurrent/QtConcurrent>
 
 #ifdef HAVE_SDL2
@@ -1421,6 +1422,16 @@ void GMainWindow::OnAppFocusStateChanged(Qt::ApplicationState state) {
     }
 }
 
+void GMainWindow::FocusWindowChanged(QWindow* focusWindow) {
+    if (focusWindow && focusWindow->winId() == winId() && !main_window_in_focus) {
+        emit FocusIn();
+        main_window_in_focus = true;
+    } else if (main_window_in_focus) {
+        emit FocusOut();
+        main_window_in_focus = false;
+    }
+}
+
 void GMainWindow::ConnectWidgetEvents() {
     connect(game_list, &GameList::BootGame, this, &GMainWindow::BootGame);
     connect(game_list, &GameList::GameChosen, this, &GMainWindow::OnGameListLoadFile);
@@ -3489,16 +3500,33 @@ void GMainWindow::ResetWindowSize1080() {
 }
 
 void GMainWindow::OnConfigure() {
-    const auto old_theme = UISettings::values.theme;
-    const bool old_discord_presence = UISettings::values.enable_discord_presence.GetValue();
+    old_configure_value = {UISettings::values.theme,
+                           UISettings::values.enable_discord_presence.GetValue()};
 
     Settings::SetConfiguringGlobal(true);
-    ConfigureDialog configure_dialog(this, hotkey_registry, input_subsystem.get(), *system,
-                                     !multiplayer_state->IsHostingPublicRoom());
-    connect(&configure_dialog, &ConfigureDialog::LanguageChanged, this,
-            &GMainWindow::OnLanguageChanged);
 
-    const auto result = configure_dialog.exec();
+    configure_dialog.reset(); // The destructor must run first
+    configure_dialog =
+        std::make_unique<ConfigureDialog>(this, hotkey_registry, input_subsystem.get(), *system,
+                                          !multiplayer_state->IsHostingPublicRoom());
+    connect(configure_dialog.get(), &ConfigureDialog::LanguageChanged, this,
+            &GMainWindow::OnLanguageChanged);
+    connect(configure_dialog.get(), &ConfigureDialog::finished, this,
+            &GMainWindow::OnConfigureFinished);
+
+    configure_dialog->show();
+
+    connect(this, &GMainWindow::FocusIn, configure_dialog.get(),
+            &ConfigureDialog::MainWindowFocusIn);
+    connect(this, &GMainWindow::FocusOut, configure_dialog.get(),
+            &ConfigureDialog::MainWindowFocusOut);
+}
+
+void GMainWindow::OnConfigureFinished(int result) {
+    // Configure dialog needs to be deleted after this function finishes to run the appropriate
+    // destructors
+    std::unique_ptr<ConfigureDialog> config_dialog(std::move(configure_dialog));
+
     if (result != QDialog::Accepted && !UISettings::values.configuration_applied &&
         !UISettings::values.reset_to_defaults) {
         // Runs if the user hit Cancel or closed the window, and did not ever press the Apply button
@@ -3508,7 +3536,7 @@ void GMainWindow::OnConfigure() {
         // Only apply new changes if user hit Okay
         // This is here to avoid applying changes if the user hit Apply, made some changes, then hit
         // Cancel
-        configure_dialog.ApplyConfiguration();
+        config_dialog->ApplyConfiguration();
     } else if (UISettings::values.reset_to_defaults) {
         LOG_INFO(Frontend, "Resetting all settings to defaults");
         if (!Common::FS::RemoveFile(config->GetConfigFilePath())) {
@@ -3545,10 +3573,11 @@ void GMainWindow::OnConfigure() {
     }
     InitializeHotkeys();
 
-    if (UISettings::values.theme != old_theme) {
+    if (UISettings::values.theme != old_configure_value.theme) {
         UpdateUITheme();
     }
-    if (UISettings::values.enable_discord_presence.GetValue() != old_discord_presence) {
+    if (UISettings::values.enable_discord_presence.GetValue() !=
+        old_configure_value.discord_presence) {
         SetDiscordEnabled(UISettings::values.enable_discord_presence.GetValue());
     }
 
@@ -4796,6 +4825,8 @@ int main(int argc, char* argv[]) {
 
     QObject::connect(&app, &QGuiApplication::applicationStateChanged, &main_window,
                      &GMainWindow::OnAppFocusStateChanged);
+    QObject::connect(&app, &QGuiApplication::focusWindowChanged, &main_window,
+                     &GMainWindow::FocusWindowChanged);
 
     int result = app.exec();
     detached_tasks.WaitForAllTasks();

src/yuzu/main.h

@@ -24,6 +24,7 @@
 
 class Config;
 class ClickableLabel;
+class ConfigureDialog;
 class EmuThread;
 class GameList;
 class GImageInfo;
@@ -132,6 +133,12 @@ class GMainWindow : public QMainWindow {
         UI_EMU_STOPPING,
     };
 
+    // Used to save previous configure values to check for changes
+    struct OldConfigureValue {
+        QString theme;
+        bool discord_presence;
+    };
+
 public:
     void filterBarSetChecked(bool state);
     void UpdateUITheme();
@@ -142,6 +149,11 @@ public:
     void AcceptDropEvent(QDropEvent* event);
 
 signals:
+    /// Emitted when this main window receives focus
+    void FocusIn();
+
+    /// Emitted when this main window loses focus
+    void FocusOut();
 
     /**
      * Signal that is emitted when a new EmuThread has been created and an emulation session is
@@ -210,6 +222,7 @@ public slots:
                                bool is_local);
     void WebBrowserRequestExit();
     void OnAppFocusStateChanged(Qt::ApplicationState state);
+    void FocusWindowChanged(QWindow* focusWindow);
     void OnTasStateChanged();
 
 private:
@@ -324,6 +337,7 @@ private slots:
     void OnMenuInstallToNAND();
     void OnMenuRecentFile();
     void OnConfigure();
+    void OnConfigureFinished(int result);
     void OnConfigureTas();
     void OnDecreaseVolume();
     void OnIncreaseVolume();
@@ -475,6 +489,11 @@ private:
     // Install progress dialog
     QProgressDialog* install_progress;
 
+    // Configuration dialog, use unique_ptr as it is possible for the user to open the configure
+    // menu multiple times, thus we must delete the old menu
+    std::unique_ptr<ConfigureDialog> configure_dialog;
+    OldConfigureValue old_configure_value;
+
     // Last game booted, used for multi-process apps
     QString last_filename_booted;
 
@@ -495,6 +514,8 @@ private:
     // True if TAS recording dialog is visible
     bool is_tas_recording_dialog_active{};
 
+    bool main_window_in_focus = false;
+
 #ifdef __unix__
     QSocketNotifier* sig_interrupt_notifier;
     static std::array<int, 3> sig_interrupt_fds;