diff options
| author | 2016-09-18 18:01:46 -0700 | |
|---|---|---|
| committer | 2016-09-18 21:14:25 -0700 | |
| commit | 396a8d91a4423d9c793eeff0798d544613647511 (patch) | |
| tree | e0203961233db1ffcbbca2e15154d71d142c5822 /src/citra_qt/configure_input.cpp | |
| parent | Tweak formatting settings (diff) | |
| download | yuzu-396a8d91a4423d9c793eeff0798d544613647511.tar.gz yuzu-396a8d91a4423d9c793eeff0798d544613647511.tar.xz yuzu-396a8d91a4423d9c793eeff0798d544613647511.zip | |
Manually tweak source formatting and then re-run clang-format
Diffstat (limited to '')
| -rw-r--r-- | src/citra_qt/configure_input.cpp | 49 |
1 files changed, 25 insertions, 24 deletions
diff --git a/src/citra_qt/configure_input.cpp b/src/citra_qt/configure_input.cpp index af473f841..7900134ca 100644 --- a/src/citra_qt/configure_input.cpp +++ b/src/citra_qt/configure_input.cpp | |||
| @@ -10,34 +10,35 @@ | |||
| 10 | 10 | ||
| 11 | ConfigureInput::ConfigureInput(QWidget* parent) | 11 | ConfigureInput::ConfigureInput(QWidget* parent) |
| 12 | : QWidget(parent), ui(std::make_unique<Ui::ConfigureInput>()) { | 12 | : QWidget(parent), ui(std::make_unique<Ui::ConfigureInput>()) { |
| 13 | |||
| 13 | ui->setupUi(this); | 14 | ui->setupUi(this); |
| 14 | 15 | ||
| 15 | // Initialize mapping of input enum to UI button. | 16 | // Initialize mapping of input enum to UI button. |
| 16 | input_mapping = { | 17 | input_mapping = { |
| 17 | {std::make_pair(Settings::NativeInput::Values::A, ui->buttonA)}, | 18 | {Settings::NativeInput::Values::A, ui->buttonA}, |
| 18 | {std::make_pair(Settings::NativeInput::Values::B, ui->buttonB)}, | 19 | {Settings::NativeInput::Values::B, ui->buttonB}, |
| 19 | {std::make_pair(Settings::NativeInput::Values::X, ui->buttonX)}, | 20 | {Settings::NativeInput::Values::X, ui->buttonX}, |
| 20 | {std::make_pair(Settings::NativeInput::Values::Y, ui->buttonY)}, | 21 | {Settings::NativeInput::Values::Y, ui->buttonY}, |
| 21 | {std::make_pair(Settings::NativeInput::Values::L, ui->buttonL)}, | 22 | {Settings::NativeInput::Values::L, ui->buttonL}, |
| 22 | {std::make_pair(Settings::NativeInput::Values::R, ui->buttonR)}, | 23 | {Settings::NativeInput::Values::R, ui->buttonR}, |
| 23 | {std::make_pair(Settings::NativeInput::Values::ZL, ui->buttonZL)}, | 24 | {Settings::NativeInput::Values::ZL, ui->buttonZL}, |
| 24 | {std::make_pair(Settings::NativeInput::Values::ZR, ui->buttonZR)}, | 25 | {Settings::NativeInput::Values::ZR, ui->buttonZR}, |
| 25 | {std::make_pair(Settings::NativeInput::Values::START, ui->buttonStart)}, | 26 | {Settings::NativeInput::Values::START, ui->buttonStart}, |
| 26 | {std::make_pair(Settings::NativeInput::Values::SELECT, ui->buttonSelect)}, | 27 | {Settings::NativeInput::Values::SELECT, ui->buttonSelect}, |
| 27 | {std::make_pair(Settings::NativeInput::Values::HOME, ui->buttonHome)}, | 28 | {Settings::NativeInput::Values::HOME, ui->buttonHome}, |
| 28 | {std::make_pair(Settings::NativeInput::Values::DUP, ui->buttonDpadUp)}, | 29 | {Settings::NativeInput::Values::DUP, ui->buttonDpadUp}, |
| 29 | {std::make_pair(Settings::NativeInput::Values::DDOWN, ui->buttonDpadDown)}, | 30 | {Settings::NativeInput::Values::DDOWN, ui->buttonDpadDown}, |
| 30 | {std::make_pair(Settings::NativeInput::Values::DLEFT, ui->buttonDpadLeft)}, | 31 | {Settings::NativeInput::Values::DLEFT, ui->buttonDpadLeft}, |
| 31 | {std::make_pair(Settings::NativeInput::Values::DRIGHT, ui->buttonDpadRight)}, | 32 | {Settings::NativeInput::Values::DRIGHT, ui->buttonDpadRight}, |
| 32 | {std::make_pair(Settings::NativeInput::Values::CUP, ui->buttonCStickUp)}, | 33 | {Settings::NativeInput::Values::CUP, ui->buttonCStickUp}, |
| 33 | {std::make_pair(Settings::NativeInput::Values::CDOWN, ui->buttonCStickDown)}, | 34 | {Settings::NativeInput::Values::CDOWN, ui->buttonCStickDown}, |
| 34 | {std::make_pair(Settings::NativeInput::Values::CLEFT, ui->buttonCStickLeft)}, | 35 | {Settings::NativeInput::Values::CLEFT, ui->buttonCStickLeft}, |
| 35 | {std::make_pair(Settings::NativeInput::Values::CRIGHT, ui->buttonCStickRight)}, | 36 | {Settings::NativeInput::Values::CRIGHT, ui->buttonCStickRight}, |
| 36 | {std::make_pair(Settings::NativeInput::Values::CIRCLE_UP, ui->buttonCircleUp)}, | 37 | {Settings::NativeInput::Values::CIRCLE_UP, ui->buttonCircleUp}, |
| 37 | {std::make_pair(Settings::NativeInput::Values::CIRCLE_DOWN, ui->buttonCircleDown)}, | 38 | {Settings::NativeInput::Values::CIRCLE_DOWN, ui->buttonCircleDown}, |
| 38 | {std::make_pair(Settings::NativeInput::Values::CIRCLE_LEFT, ui->buttonCircleLeft)}, | 39 | {Settings::NativeInput::Values::CIRCLE_LEFT, ui->buttonCircleLeft}, |
| 39 | {std::make_pair(Settings::NativeInput::Values::CIRCLE_RIGHT, ui->buttonCircleRight)}, | 40 | {Settings::NativeInput::Values::CIRCLE_RIGHT, ui->buttonCircleRight}, |
| 40 | {std::make_pair(Settings::NativeInput::Values::CIRCLE_MODIFIER, ui->buttonCircleMod)}, | 41 | {Settings::NativeInput::Values::CIRCLE_MODIFIER, ui->buttonCircleMod}, |
| 41 | }; | 42 | }; |
| 42 | 43 | ||
| 43 | // Attach handle click method to each button click. | 44 | // Attach handle click method to each button click. |