piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-06-28 01:49:33 -06:00
Code Issues Packages Projects Releases Wiki Activity

InputCommon: Support detecting combinations of inputs. (Hotkeys)

Browse Source
This commit is contained in:
Jordan Woyak
2019-10-23 17:20:42 -05:00
parent e6ba495486
commit b3acc7403f
3 changed files with 44 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Source/Core/DolphinQt/Config/Mapping/MappingCommon.cpp
View File

@ -68,7 +68,7 @@ QString DetectExpression(QPushButton* button, ciface::Core::DeviceContainer& dev
// Avoid that the button press itself is registered as an event
Common::SleepCurrentThread(50);
const auto [device, input] = device_container.DetectInput(INPUT_DETECT_TIME, device_strings);
const auto detections = device_container.DetectInput(INPUT_DETECT_TIME, device_strings);
const auto timer = new QTimer(button);
@ -83,14 +83,24 @@ QString DetectExpression(QPushButton* button, ciface::Core::DeviceContainer& dev
button->setText(old_text);
if (!input)
return {};
QString full_expression;
ciface::Core::DeviceQualifier device_qualifier;
device_qualifier.FromDevice(device.get());
for (auto [device, input] : detections)
{
ciface::Core::DeviceQualifier device_qualifier;
device_qualifier.FromDevice(device.get());
return MappingCommon::GetExpressionForControl(QString::fromStdString(input->GetName()),
device_qualifier, default_device, quote);
if (!full_expression.isEmpty())
full_expression += QChar::fromLatin1('+');
full_expression += MappingCommon::GetExpressionForControl(
QString::fromStdString(input->GetName()), device_qualifier, default_device, quote);
}
if (detections.size() > 1)
return QStringLiteral("@(%1)").arg(std::move(full_expression));
return full_expression;
}
void TestOutput(QPushButton* button, OutputReference* reference)