vyn/mirai
1
Fork 0
mirror of https://codeberg.org/vyn/mirai.git synced 2025-07-02 01:13:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix events from different sources not being sorted correctly

Browse source
This commit is contained in:
Vyn 2024-09-09 15:22:05 +02:00
parent cb6c663833
commit 07081bb27b
1 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

17
external/mirai-core/src/TasksView.cpp vendored
View file

@ -91,14 +91,6 @@ void TasksView::update()
filteredDay.filteredEvents.push_back(filteredEvent); filteredDay.filteredEvents.push_back(filteredEvent);
} }
} }
if (!filteredDay.filteredEvents.empty()) {
std::ranges::sort(
filteredDay.filteredEvents,
[](const FilteredEvent &t1, const FilteredEvent &t2) {
return t1.event->getStartTime().hour < t2.event->getStartTime().hour;
}
);
}
if (!filteredDay.filteredEvents.empty() || !filteredDay.filteredTasks.empty()) { if (!filteredDay.filteredEvents.empty() || !filteredDay.filteredTasks.empty()) {
auto existingDay = std::ranges::find_if(filteredDays, [&](const FilteredDay &date) { auto existingDay = std::ranges::find_if(filteredDays, [&](const FilteredDay &date) {
return date.day->getDate() == filteredDay.day->getDate(); return date.day->getDate() == filteredDay.day->getDate();
@ -118,6 +110,15 @@ void TasksView::update()
} }
} }
for (auto &filteredDay : filteredDays) {
std::ranges::sort(
filteredDay.filteredEvents,
[](const FilteredEvent &t1, const FilteredEvent &t2) {
return t1.event->getStartTime().hour < t2.event->getStartTime().hour;
}
);
}
std::ranges::sort(filteredDays, [](const FilteredDay &t1, const FilteredDay &t2) { std::ranges::sort(filteredDays, [](const FilteredDay &t1, const FilteredDay &t2) {
return t1.day->getDate() < t2.day->getDate(); return t1.day->getDate() < t2.day->getDate();
}); });