From 7af2ea816f6c5842ce6cbb6be34fec63e3a43d7e Mon Sep 17 00:00:00 2001
From: chinhodado <chin.bimbo@gmail.com>
Date: Wed, 5 Aug 2015 20:26:27 -0400
Subject: [PATCH] Fixup: Change key order so that the grouping is more logical

---
 src/citra/config.cpp    |  4 ++--
 src/citra_qt/config.cpp |  4 ++--
 src/core/settings.h     | 11 +++++------
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/citra/config.cpp b/src/citra/config.cpp
index 2c1407a6f..f83d14227 100644
--- a/src/citra/config.cpp
+++ b/src/citra/config.cpp
@@ -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 = {
     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_M, GLFW_KEY_N, GLFW_KEY_B,
     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_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() {
diff --git a/src/citra_qt/config.cpp b/src/citra_qt/config.cpp
index 98b32e7e8..5ff8039a5 100644
--- a/src/citra_qt/config.cpp
+++ b/src/citra_qt/config.cpp
@@ -22,10 +22,10 @@ Config::Config() {
 const std::array<QVariant, Settings::NativeInput::NUM_INPUTS> Config::defaults = {
     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_M, Qt::Key_N, Qt::Key_B,
     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_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() {
diff --git a/src/core/settings.h b/src/core/settings.h
index 2775ee257..70e5c9a2b 100644
--- a/src/core/settings.h
+++ b/src/core/settings.h
@@ -13,31 +13,30 @@ namespace NativeInput {
 enum Values {
     A, B, X, Y,
     L, R, ZL, ZR,
-    START, SELECT, HOME,
     DUP, DDOWN, DLEFT, DRIGHT,
     SUP, SDOWN, SLEFT, SRIGHT,
     CUP, CDOWN, CLEFT, CRIGHT,
+    START, SELECT, HOME,
     NUM_INPUTS
 };
 static const std::array<const char*, NUM_INPUTS> Mapping = {
     "pad_a", "pad_b", "pad_x", "pad_y",
     "pad_l", "pad_r", "pad_zl", "pad_zr",
-    "pad_start", "pad_select", "pad_home",
     "pad_dup", "pad_ddown", "pad_dleft", "pad_dright",
     "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 = {
     A, B, X, Y,
     L, R, ZL, ZR,
-    START, SELECT, HOME,
     DUP, DDOWN, DLEFT, DRIGHT,
     SUP, SDOWN, SLEFT, SRIGHT,
-    CUP, CDOWN, CLEFT, CRIGHT
+    CUP, CDOWN, CLEFT, CRIGHT,
+    START, SELECT, HOME
 };
 }
 
-
 struct Values {
     // Controls
     std::array<int, NativeInput::NUM_INPUTS> input_mappings;