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

Merge pull request #11268 from jordan-woyak/ascii-controller

Browse Source 
Rename "Keyboard" to "Keyboard Controller"
This commit is contained in:
Mai
2022-12-04 21:05:52 +00:00
committed by GitHub
parent 92cab5d0a6 e9af3d945a
commit a9a603b8cb
5 changed files with 25 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Core/Core/HW/GCKeyboardEmu.cpp
View File

@ -75,9 +75,6 @@ GCKeyboard::GCKeyboard(const unsigned int index) : m_index(index)
groups.emplace_back(m_keys5x = new ControllerEmu::Buttons(_trans("Keys")));
for (const char* key : named_keys5)
m_keys5x->AddInput(ControllerEmu::DoNotTranslate, key);
// options
groups.emplace_back(m_options = new ControllerEmu::ControlGroup(_trans("Options")));
}
std::string GCKeyboard::GetName() const
@ -101,8 +98,6 @@ ControllerEmu::ControlGroup* GCKeyboard::GetGroup(KeyboardGroup group)
return m_keys4x;
case KeyboardGroup::Kb5x:
return m_keys5x;
case KeyboardGroup::Options:
return m_options;
default:
return nullptr;
}

3
Source/Core/Core/HW/GCKeyboardEmu.h
View File

@ -23,8 +23,6 @@ enum class KeyboardGroup
Kb3x,
Kb4x,
Kb5x,
Options
};
class GCKeyboard : public ControllerEmu::EmulatedController
@ -43,7 +41,6 @@ private:
ControllerEmu::Buttons* m_keys3x;
ControllerEmu::Buttons* m_keys4x;
ControllerEmu::Buttons* m_keys5x;
ControllerEmu::ControlGroup* m_options;
const unsigned int m_index;
};