diff options
| author | Anthony <Helios747@users.noreply.github.com> | 2017-03-19 22:31:30 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-19 22:31:30 -0700 |
| commit | b35bbdfb58b80f5799ab5d43fcab4b72da7594b2 (patch) | |
| tree | 6b2ee0277409261f069276f666684c709c9060ee /Source/Core/DolphinWX/ControllerConfigDiag.cpp | |
| parent | 8eb26d298e383a56e8a0f2be580ed2c5f69eacbf (diff) | |
| parent | 1b0701e988bcdfe0f822638bb5c22bbd3739fd06 (diff) | |
Merge pull request #4856 from ligfx/backgroundinput
Move "Background Input" out of individual controller configurations
Diffstat (limited to 'Source/Core/DolphinWX/ControllerConfigDiag.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/ControllerConfigDiag.cpp | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/Source/Core/DolphinWX/ControllerConfigDiag.cpp b/Source/Core/DolphinWX/ControllerConfigDiag.cpp index 50661833c5..529b8802c7 100644 --- a/Source/Core/DolphinWX/ControllerConfigDiag.cpp +++ b/Source/Core/DolphinWX/ControllerConfigDiag.cpp @@ -60,6 +60,8 @@ ControllerConfigDiag::ControllerConfigDiag(wxWindow* const parent) main_sizer->AddSpacer(space5); main_sizer->Add(CreateWiimoteConfigSizer(), 0, wxEXPAND | wxLEFT | wxRIGHT, space5); main_sizer->AddSpacer(space5); + main_sizer->Add(CreateAdvancedSettingsSizer(), 0, wxEXPAND | wxLEFT | wxRIGHT, space5); + main_sizer->AddSpacer(space5); main_sizer->Add(CreateButtonSizer(wxCLOSE | wxNO_DEFAULT), 0, wxEXPAND | wxLEFT | wxRIGHT, space5); main_sizer->AddSpacer(space5); @@ -220,6 +222,25 @@ wxSizer* ControllerConfigDiag::CreateGamecubeSizer() return gamecube_static_sizer; } +void ControllerConfigDiag::OnBackgroundInputChanged(wxCommandEvent& event) +{ + SConfig::GetInstance().m_BackgroundInput = event.IsChecked(); +} + +wxSizer* ControllerConfigDiag::CreateAdvancedSettingsSizer() +{ + const int space5 = FromDIP(5); + + m_background_input_checkbox = new wxCheckBox(this, wxID_ANY, _("Background Input")); + m_background_input_checkbox->SetValue(SConfig::GetInstance().m_BackgroundInput); + m_background_input_checkbox->Bind(wxEVT_CHECKBOX, &ControllerConfigDiag::OnBackgroundInputChanged, + this); + + auto* const box = new wxStaticBoxSizer(wxVERTICAL, this, _("Advanced Settings")); + box->Add(m_background_input_checkbox, 0, wxEXPAND | wxLEFT | wxRIGHT, space5); + return box; +} + wxSizer* ControllerConfigDiag::CreateWiimoteConfigSizer() { const int space5 = FromDIP(5); |
