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

Implement hotkey options group in HotkeyInputConfigDiag

Browse Source
This commit is contained in:
Michael Maltese
2017-02-07 18:26:06 -08:00
parent a6bc56b626
commit 8adad0729e
4 changed files with 47 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Core/Core/HotkeyManager.h
View File

@ -199,7 +199,6 @@ public:
void GetInput(HotkeyStatus* const hk);
std::string GetName() const override;
ControllerEmu::ControlGroup* GetHotkeyGroup(HotkeyGroup group) const;
ControllerEmu::ControlGroup* GetOptionsGroup() const;
int FindGroupByID(int id) const;
int GetIndexForGroup(int group, int id) const;
void LoadDefaults(const ControllerInterface& ciface) override;
@ -207,7 +206,6 @@ public:
private:
ControllerEmu::Buttons* m_keys[NUM_HOTKEY_GROUPS];
std::array<ControllerEmu::ControlGroup*, NUM_HOTKEY_GROUPS> m_hotkey_groups;
ControllerEmu::ControlGroup* m_options;
};
namespace HotkeyManagerEmu
@ -218,7 +216,6 @@ void LoadConfig();
InputConfig* GetConfig();
ControllerEmu::ControlGroup* GetHotkeyGroup(HotkeyGroup group);
ControllerEmu::ControlGroup* GetOptionsGroup();
void GetStatus();
bool IsEnabled();
void Enable(bool enable_toggle);