Yaya48/dolphin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4975 from ligfx/controlsetting

Browse Source 
InputCommon: move Setting classes out of ControlGroup
This commit is contained in:
Matthew Parlane
2017-03-03 15:17:25 +13:00
committed by GitHub
parent 1392b88879 1539ff6691
commit 51e932b4ec
30 changed files with 274 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Core/DolphinWX/Input/InputConfigDiag.cpp
+4 -2
View File
@@ -63,6 +63,8 @@
#include "InputCommon/ControllerEmu/ControlGroup/ControlGroup.h"
#include "InputCommon/ControllerEmu/ControlGroup/Extension.h"
#include "InputCommon/ControllerEmu/ControllerEmu.h"
#include "InputCommon/ControllerEmu/Setting/BooleanSetting.h"
#include "InputCommon/ControllerEmu/Setting/NumericSetting.h"
#include "InputCommon/ControllerInterface/ControllerInterface.h"
#include "InputCommon/ControllerInterface/Device.h"
#include "InputCommon/InputConfig.h"
@@ -144,7 +146,7 @@ void PadSettingExtension::UpdateValue()
}
PadSettingCheckBox::PadSettingCheckBox(wxWindow* const parent,
ControllerEmu::ControlGroup::BooleanSetting* const _setting)
ControllerEmu::BooleanSetting* const _setting)
: PadSetting(
new wxCheckBox(parent, wxID_ANY, wxGetTranslation(StrToWxStr(_setting->m_ui_name)))),
setting(_setting)
@@ -167,7 +169,7 @@ void PadSettingCheckBox::UpdateValue()
}
PadSettingSpin::PadSettingSpin(wxWindow* const parent,
ControllerEmu::ControlGroup::NumericSetting* const settings)
ControllerEmu::NumericSetting* const settings)
: PadSetting(new wxSpinCtrl(parent, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize,
wxSP_ARROW_KEYS, settings->m_low, settings->m_high,
(int)(settings->m_value * 100))),
Source/Core/DolphinWX/Input/InputConfigDiag.h
+4 -6
View File
@@ -67,23 +67,21 @@ public:
class PadSettingSpin : public PadSetting
{
public:
PadSettingSpin(wxWindow* const parent,
ControllerEmu::ControlGroup::NumericSetting* const setting);
PadSettingSpin(wxWindow* const parent, ControllerEmu::NumericSetting* const setting);
void UpdateGUI() override;
void UpdateValue() override;
ControllerEmu::ControlGroup::NumericSetting* const setting;
ControllerEmu::NumericSetting* const setting;
};
class PadSettingCheckBox : public PadSetting
{
public:
PadSettingCheckBox(wxWindow* const parent,
ControllerEmu::ControlGroup::BooleanSetting* const setting);
PadSettingCheckBox(wxWindow* const parent, ControllerEmu::BooleanSetting* const setting);
void UpdateGUI() override;
void UpdateValue() override;
ControllerEmu::ControlGroup::BooleanSetting* const setting;
ControllerEmu::BooleanSetting* const setting;
};
class InputEventFilter : public wxEventFilter
Source/Core/DolphinWX/Input/WiimoteInputConfigDiag.cpp
+4
View File
@@ -10,6 +10,10 @@
#include "Core/HW/Wiimote.h"
#include "Core/HW/WiimoteEmu/WiimoteEmu.h"
#include "InputCommon/ControllerEmu/Setting/BackgroundInputSetting.h"
#include "InputCommon/ControllerEmu/Setting/BooleanSetting.h"
#include "InputCommon/ControllerEmu/Setting/NumericSetting.h"
WiimoteInputConfigDialog::WiimoteInputConfigDialog(wxWindow* const parent, InputConfig& config,
const wxString& name, const int port_num)
: InputConfigDialog(parent, config, name, port_num)