notsoyuzu
/
yuzu-mainline
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

yuzu/configuration/configure_mouse_advanced: Clean up array accesses 

Deduplicates array accesses and uses a named variable where appropriate.
This commit is contained in:
Lioncash 2019-05-19 12:31:47 -04:00
parent c9c4208c4a
commit 3039211c20
1 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/yuzu/configuration/configure_mouse_advanced.cpp
View File

@ -77,30 +77,31 @@ ConfigureMouseAdvanced::ConfigureMouseAdvanced(QWidget* parent)
}; };
for (int button_id = 0; button_id < Settings::NativeMouseButton::NumMouseButtons; button_id++) { for (int button_id = 0; button_id < Settings::NativeMouseButton::NumMouseButtons; button_id++) {
if (!button_map[button_id]) auto* const button = button_map[button_id];
if (button == nullptr) {
continue; continue;
button_map[button_id]->setContextMenuPolicy(Qt::CustomContextMenu); }
connect(button_map[button_id], &QPushButton::released, [=]() {
button->setContextMenuPolicy(Qt::CustomContextMenu);
connect(button, &QPushButton::released, [=] {
handleClick( handleClick(
button_map[button_id], button_map[button_id],
[=](const Common::ParamPackage& params) { buttons_param[button_id] = params; }, [=](const Common::ParamPackage& params) { buttons_param[button_id] = params; },
InputCommon::Polling::DeviceType::Button); InputCommon::Polling::DeviceType::Button);
}); });
connect(button_map[button_id], &QPushButton::customContextMenuRequested, connect(button, &QPushButton::customContextMenuRequested, [=](const QPoint& menu_location) {
[=](const QPoint& menu_location) { QMenu context_menu;
QMenu context_menu; context_menu.addAction(tr("Clear"), [&] {
context_menu.addAction(tr("Clear"), [&] { buttons_param[button_id].Clear();
buttons_param[button_id].Clear(); button_map[button_id]->setText(tr("[not set]"));
button_map[button_id]->setText(tr("[not set]")); });
}); context_menu.addAction(tr("Restore Default"), [&] {
context_menu.addAction(tr("Restore Default"), [&] { buttons_param[button_id] = Common::ParamPackage{
buttons_param[button_id] = InputCommon::GenerateKeyboardParam(Config::default_mouse_buttons[button_id])};
Common::ParamPackage{InputCommon::GenerateKeyboardParam( button_map[button_id]->setText(ButtonToText(buttons_param[button_id]));
Config::default_mouse_buttons[button_id])}; });
button_map[button_id]->setText(ButtonToText(buttons_param[button_id])); context_menu.exec(button_map[button_id]->mapToGlobal(menu_location));
}); });
context_menu.exec(button_map[button_id]->mapToGlobal(menu_location));
});
} }
connect(ui->buttonClearAll, &QPushButton::released, [this] { ClearAll(); }); connect(ui->buttonClearAll, &QPushButton::released, [this] { ClearAll(); });
@ -150,8 +151,10 @@ void ConfigureMouseAdvanced::restoreDefaults() {
void ConfigureMouseAdvanced::ClearAll() { void ConfigureMouseAdvanced::ClearAll() {
for (int i = 0; i < Settings::NativeMouseButton::NumMouseButtons; ++i) { for (int i = 0; i < Settings::NativeMouseButton::NumMouseButtons; ++i) {
if (button_map[i] && button_map[i]->isEnabled()) const auto* const button = button_map[i];
if (button != nullptr && button->isEnabled()) {
buttons_param[i].Clear(); buttons_param[i].Clear();
}
} }
updateButtonLabels(); updateButtonLabels();