summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorph <39850852+Morph1984@users.noreply.github.com>2021-04-25 13:00:29 +0200
committerMorph <39850852+Morph1984@users.noreply.github.com>2021-04-25 13:26:57 +0200
commit3b5690c9e1c7aa6024cf6c6de0829e0898cccb81 (patch)
treec4e324942722b5887ce4a7c8f025dbc1a5440bf2
parentMerge pull request #6238 from ameerj/vk-bgr-fix (diff)
downloadyuzu-3b5690c9e1c7aa6024cf6c6de0829e0898cccb81.tar
yuzu-3b5690c9e1c7aa6024cf6c6de0829e0898cccb81.tar.gz
yuzu-3b5690c9e1c7aa6024cf6c6de0829e0898cccb81.tar.bz2
yuzu-3b5690c9e1c7aa6024cf6c6de0829e0898cccb81.tar.lz
yuzu-3b5690c9e1c7aa6024cf6c6de0829e0898cccb81.tar.xz
yuzu-3b5690c9e1c7aa6024cf6c6de0829e0898cccb81.tar.zst
yuzu-3b5690c9e1c7aa6024cf6c6de0829e0898cccb81.zip
-rw-r--r--src/yuzu/configuration/config.cpp19
1 files changed, 10 insertions, 9 deletions
diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cpp
index 851246233..f4bd8069b 100644
--- a/src/yuzu/configuration/config.cpp
+++ b/src/yuzu/configuration/config.cpp
@@ -29,9 +29,10 @@ Config::~Config() {
}
const std::array<int, Settings::NativeButton::NumButtons> Config::default_buttons = {
- Qt::Key_A, Qt::Key_S, Qt::Key_Z, Qt::Key_X, Qt::Key_3, Qt::Key_4, Qt::Key_Q,
- Qt::Key_W, Qt::Key_1, Qt::Key_2, Qt::Key_N, Qt::Key_M, Qt::Key_F, Qt::Key_T,
- Qt::Key_H, Qt::Key_G, Qt::Key_D, Qt::Key_C, Qt::Key_B, Qt::Key_V,
+ Qt::Key_C, Qt::Key_X, Qt::Key_V, Qt::Key_Z, Qt::Key_F,
+ Qt::Key_G, Qt::Key_Q, Qt::Key_E, Qt::Key_R, Qt::Key_T,
+ Qt::Key_M, Qt::Key_N, Qt::Key_Left, Qt::Key_Up, Qt::Key_Right,
+ Qt::Key_Down, Qt::Key_Q, Qt::Key_E, 0, 0,
};
const std::array<int, Settings::NativeMotion::NumMotions> Config::default_motions = {
@@ -41,10 +42,10 @@ const std::array<int, Settings::NativeMotion::NumMotions> Config::default_motion
const std::array<std::array<int, 4>, Settings::NativeAnalog::NumAnalogs> Config::default_analogs{{
{
- Qt::Key_Up,
- Qt::Key_Down,
- Qt::Key_Left,
- Qt::Key_Right,
+ Qt::Key_W,
+ Qt::Key_S,
+ Qt::Key_A,
+ Qt::Key_D,
},
{
Qt::Key_I,
@@ -55,8 +56,8 @@ const std::array<std::array<int, 4>, Settings::NativeAnalog::NumAnalogs> Config:
}};
const std::array<int, 2> Config::default_stick_mod = {
- Qt::Key_E,
- Qt::Key_R,
+ Qt::Key_Shift,
+ 0,
};
const std::array<int, Settings::NativeMouseButton::NumMouseButtons> Config::default_mouse_buttons =