Input: Move pairing dialog button and source (#1424)

cemu-project · Nov 30, 2024 · 0735237 · 0735237
1 parent 90eb2e0
commit 0735237
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 15 deletions.
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
@@ -75,6 +75,8 @@ add_library(CemuGui
   input/InputAPIAddWindow.h
   input/InputSettings2.cpp
   input/InputSettings2.h
+  input/PairingDialog.cpp
+  input/PairingDialog.h
   input/panels/ClassicControllerInputPanel.cpp
   input/panels/ClassicControllerInputPanel.h
   input/panels/InputPanel.cpp
@@ -97,8 +99,6 @@ add_library(CemuGui
   MemorySearcherTool.h
   PadViewFrame.cpp
   PadViewFrame.h
-  PairingDialog.cpp
-  PairingDialog.h
   TitleManager.cpp
   TitleManager.h
   EmulatedUSBDevices/EmulatedUSBDeviceFrame.cpp

diff --git a/src/gui/input/InputSettings2.cpp b/src/gui/input/InputSettings2.cpp
@@ -20,6 +20,8 @@
 #include "gui/input/InputAPIAddWindow.h"
 #include "input/ControllerFactory.h"
 
+#include "gui/input/PairingDialog.h"
+
 #include "gui/input/panels/VPADInputPanel.h"
 #include "gui/input/panels/ProControllerInputPanel.h"
 
@@ -252,6 +254,13 @@ wxWindow* InputSettings2::initialize_page(size_t index)
 			page_data.m_controller_api_remove = remove_api;
 		}
 
+		auto* pairingDialog = new wxButton(page, wxID_ANY, _("Pair Wii/Wii U Controller"));
+		pairingDialog->Bind(wxEVT_BUTTON, [this](wxEvent&) {
+			PairingDialog pairing_dialog(this);
+			pairing_dialog.ShowModal();
+		});
+		sizer->Add(pairingDialog, wxGBPosition(5, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL | wxALL, 5);
+
 		// controller
 		auto* controller_bttns = new wxBoxSizer(wxHORIZONTAL);
 		auto* settings = new wxButton(page, wxID_ANY, _("Settings"), wxDefaultPosition, wxDefaultSize, 0);

diff --git a/src/gui/PairingDialog.cpp → src/gui/input/PairingDialog.cpp b/src/gui/PairingDialog.cpp → src/gui/input/PairingDialog.cpp
@@ -1,5 +1,5 @@
 #include "gui/wxgui.h"
-#include "gui/PairingDialog.h"
+#include "PairingDialog.h"
 
 #if BOOST_OS_WINDOWS
 #include <bluetoothapis.h>

diff --git a/src/gui/PairingDialog.h → src/gui/input/PairingDialog.h b/src/gui/PairingDialog.h → src/gui/input/PairingDialog.h
diff --git a/src/gui/input/panels/WiimoteInputPanel.cpp b/src/gui/input/panels/WiimoteInputPanel.cpp
@@ -12,7 +12,6 @@
 #include "input/emulated/WiimoteController.h"
 #include "gui/helpers/wxHelpers.h"
 #include "gui/components/wxInputDraw.h"
-#include "gui/PairingDialog.h"
 
 constexpr WiimoteController::ButtonId g_kFirstColumnItems[] =
 {
@@ -40,11 +39,6 @@ WiimoteInputPanel::WiimoteInputPanel(wxWindow* parent)
 	auto* main_sizer = new wxBoxSizer(wxVERTICAL);
     auto* horiz_main_sizer = new wxBoxSizer(wxHORIZONTAL);
 
-    auto* pair_button = new wxButton(this, wxID_ANY, _("Pair a Wii or Wii U controller"));
-    pair_button->Bind(wxEVT_BUTTON, &WiimoteInputPanel::on_pair_button, this);
-    horiz_main_sizer->Add(pair_button);
-    horiz_main_sizer->AddSpacer(10);
-
     auto* extensions_sizer = new wxBoxSizer(wxHORIZONTAL);
     horiz_main_sizer->Add(extensions_sizer, wxSizerFlags(0).Align(wxALIGN_CENTER_VERTICAL));
 
@@ -264,9 +258,3 @@ void WiimoteInputPanel::load_controller(const EmulatedControllerPtr& emulated_co
 		set_active_device_type(wiimote->get_device_type());
 	}
 }
-
-void WiimoteInputPanel::on_pair_button(wxCommandEvent& event)
-{
-    PairingDialog pairing_dialog(this);
-    pairing_dialog.ShowModal();
-}