piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-29 17:19:44 -06:00
Code Issues Packages Projects Releases Wiki Activity

InputCommon: move Setting classes out of ControlGroup

Browse Source
This commit is contained in:
Michael Maltese
2017-02-26 12:00:24 -08:00
parent 4e062d1bf6
commit 1539ff6691
30 changed files with 274 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/DolphinWX/Input/InputConfigDiag.cpp
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))),

10
Source/Core/DolphinWX/Input/InputConfigDiag.h
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

4
Source/Core/DolphinWX/Input/WiimoteInputConfigDiag.cpp
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)