N-archive/citra
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixup: Change key order so that the grouping is more logical

Browse source
This commit is contained in:
chinhodado 2015-08-05 20:26:27 -04:00
parent 27dc705f7e
commit 7af2ea816f
3 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/citra/config.cpp
View file

@ -43,10 +43,10 @@ bool Config::LoadINI(INIReader* config, const char* location, const std::string&
static const std::array<int, Settings::NativeInput::NUM_INPUTS> defaults = { static const std::array<int, Settings::NativeInput::NUM_INPUTS> defaults = {
GLFW_KEY_A, GLFW_KEY_S, GLFW_KEY_Z, GLFW_KEY_X, GLFW_KEY_A, GLFW_KEY_S, GLFW_KEY_Z, GLFW_KEY_X,
GLFW_KEY_Q, GLFW_KEY_W, GLFW_KEY_1, GLFW_KEY_2, GLFW_KEY_Q, GLFW_KEY_W, GLFW_KEY_1, GLFW_KEY_2,
GLFW_KEY_M, GLFW_KEY_N, GLFW_KEY_B,
GLFW_KEY_T, GLFW_KEY_G, GLFW_KEY_F, GLFW_KEY_H, GLFW_KEY_T, GLFW_KEY_G, GLFW_KEY_F, GLFW_KEY_H,
GLFW_KEY_UP, GLFW_KEY_DOWN, GLFW_KEY_LEFT, GLFW_KEY_RIGHT, GLFW_KEY_UP, GLFW_KEY_DOWN, GLFW_KEY_LEFT, GLFW_KEY_RIGHT,
GLFW_KEY_I, GLFW_KEY_K, GLFW_KEY_J, GLFW_KEY_L GLFW_KEY_I, GLFW_KEY_K, GLFW_KEY_J, GLFW_KEY_L,
GLFW_KEY_M, GLFW_KEY_N, GLFW_KEY_B
}; };
void Config::ReadValues() { void Config::ReadValues() {

4
src/citra_qt/config.cpp
View file

@ -22,10 +22,10 @@ Config::Config() {
const std::array<QVariant, Settings::NativeInput::NUM_INPUTS> Config::defaults = { const std::array<QVariant, Settings::NativeInput::NUM_INPUTS> Config::defaults = {
Qt::Key_A, Qt::Key_S, Qt::Key_Z, Qt::Key_X, Qt::Key_A, Qt::Key_S, Qt::Key_Z, Qt::Key_X,
Qt::Key_Q, Qt::Key_W, Qt::Key_1, Qt::Key_2, Qt::Key_Q, Qt::Key_W, Qt::Key_1, Qt::Key_2,
Qt::Key_M, Qt::Key_N, Qt::Key_B,
Qt::Key_T, Qt::Key_G, Qt::Key_F, Qt::Key_H, Qt::Key_T, Qt::Key_G, Qt::Key_F, Qt::Key_H,
Qt::Key_Up, Qt::Key_Down, Qt::Key_Left, Qt::Key_Right, Qt::Key_Up, Qt::Key_Down, Qt::Key_Left, Qt::Key_Right,
Qt::Key_I, Qt::Key_K, Qt::Key_J, Qt::Key_L Qt::Key_I, Qt::Key_K, Qt::Key_J, Qt::Key_L,
Qt::Key_M, Qt::Key_N, Qt::Key_B
}; };
void Config::ReadValues() { void Config::ReadValues() {

11
src/core/settings.h
View file

@ -13,31 +13,30 @@ namespace NativeInput {
enum Values { enum Values {
A, B, X, Y, A, B, X, Y,
L, R, ZL, ZR, L, R, ZL, ZR,
START, SELECT, HOME,
DUP, DDOWN, DLEFT, DRIGHT, DUP, DDOWN, DLEFT, DRIGHT,
SUP, SDOWN, SLEFT, SRIGHT, SUP, SDOWN, SLEFT, SRIGHT,
CUP, CDOWN, CLEFT, CRIGHT, CUP, CDOWN, CLEFT, CRIGHT,
START, SELECT, HOME,
NUM_INPUTS NUM_INPUTS
}; };
static const std::array<const char*, NUM_INPUTS> Mapping = { static const std::array<const char*, NUM_INPUTS> Mapping = {
"pad_a", "pad_b", "pad_x", "pad_y", "pad_a", "pad_b", "pad_x", "pad_y",
"pad_l", "pad_r", "pad_zl", "pad_zr", "pad_l", "pad_r", "pad_zl", "pad_zr",
"pad_start", "pad_select", "pad_home",
"pad_dup", "pad_ddown", "pad_dleft", "pad_dright", "pad_dup", "pad_ddown", "pad_dleft", "pad_dright",
"pad_sup", "pad_sdown", "pad_sleft", "pad_sright", "pad_sup", "pad_sdown", "pad_sleft", "pad_sright",
"pad_cup", "pad_cdown", "pad_cleft", "pad_cright" "pad_cup", "pad_cdown", "pad_cleft", "pad_cright",
"pad_start", "pad_select", "pad_home"
}; };
static const std::array<Values, NUM_INPUTS> All = { static const std::array<Values, NUM_INPUTS> All = {
A, B, X, Y, A, B, X, Y,
L, R, ZL, ZR, L, R, ZL, ZR,
START, SELECT, HOME,
DUP, DDOWN, DLEFT, DRIGHT, DUP, DDOWN, DLEFT, DRIGHT,
SUP, SDOWN, SLEFT, SRIGHT, SUP, SDOWN, SLEFT, SRIGHT,
CUP, CDOWN, CLEFT, CRIGHT CUP, CDOWN, CLEFT, CRIGHT,
START, SELECT, HOME
}; };
} }
struct Values { struct Values {
// Controls // Controls
std::array<int, NativeInput::NUM_INPUTS> input_mappings; std::array<int, NativeInput::NUM_INPUTS> input_mappings;