mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-05-01 08:48:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Modernize std::stable_sort with ranges and projections

Browse source
This commit is contained in:
mitaclaw 2024-09-28 22:20:48 -07:00
parent 8b9f92a0af
commit c9f589faa5
4 changed files with 13 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp
View file

@ -273,18 +273,14 @@ bool ControllerInterface::AddDevice(std::shared_ptr<ciface::Core::Device> device
NOTICE_LOG_FMT(CONTROLLERINTERFACE, "Added device: {}", device->GetQualifiedName());
m_devices.emplace_back(std::move(device));
// We can't (and don't want) to control the order in which devices are added, but we
// need their order to be consistent, and we need the same one to always be the first, where
// present (the keyboard and mouse device usually). This is because when defaulting a
// controller profile, it will automatically select the first device in the list as its default.
std::stable_sort(m_devices.begin(), m_devices.end(),
[](const std::shared_ptr<ciface::Core::Device>& a,
const std::shared_ptr<ciface::Core::Device>& b) {
// It would be nice to sort devices by Source then Name then ID but it's
// better to leave them sorted by the add order, which also avoids breaking
// the order on other platforms that are less tested.
return a->GetSortPriority() > b->GetSortPriority();
});
// We can't (and don't want) to control the order in which devices are added, but we need
// their order to be consistent, and we need the same one to always be the first, where present
// (the keyboard and mouse device usually). This is because when defaulting a controller
// profile, it will automatically select the first device in the list as its default. It would
// be nice to sort devices by Source then Name then ID, but it's better to leave them sorted by
// the add order. This also avoids breaking the order on other platforms that are less tested.
std::ranges::stable_sort(m_devices, std::ranges::greater{},
&ciface::Core::Device::GetSortPriority);
}
if (!m_populating_devices_counter)