Git-Mirrors/portapack-mayhem
1
0
Fork 0
mirror of https://github.com/eried/portapack-mayhem.git synced 2025-01-26 14:36:17 -05:00
Code Issues Packages Projects Releases Wiki Activity

RecentEntries: Extract range_around().

Browse Source
This commit is contained in:
Jared Boone 2016-09-03 17:09:03 -07:00
parent 42d98c3b45
commit b596d0697c
1 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
firmware/application/recent_entries.hpp
View File

@ -41,7 +41,6 @@ public:
using ContainerType = std::list<EntryType>; using ContainerType = std::list<EntryType>;
using const_reference = typename ContainerType::const_reference; using const_reference = typename ContainerType::const_reference;
using const_iterator = typename ContainerType::const_iterator; using const_iterator = typename ContainerType::const_iterator;
using RangeType = std::pair<const_iterator, const_iterator>;
EntryType& on_packet(const Key key) { EntryType& on_packet(const Key key) {
auto matching_recent = find(key); auto matching_recent = find(key);
@ -80,28 +79,6 @@ public:
return entries.empty(); return entries.empty();
} }
RangeType range_around(
const_iterator item, const size_t count
) const {
auto start = item;
auto end = item;
size_t i = 0;
// Move start iterator toward first entry.
while( (start != std::begin(entries)) && (i < count / 2) ) {
std::advance(start, -1);
i++;
}
// Move end iterator toward last entry.
while( (end != std::end(entries)) && (i < count) ) {
std::advance(end, 1);
i++;
}
return { start, end };
}
private: private:
ContainerType entries; ContainerType entries;
const size_t entries_max = 64; const size_t entries_max = 64;
@ -113,6 +90,31 @@ private:
} }
}; };
template<typename ContainerType>
static std::pair<typename ContainerType::const_iterator, typename ContainerType::const_iterator> range_around(
const ContainerType& entries,
typename ContainerType::const_iterator item,
const size_t count
) {
auto start = item;
auto end = item;
size_t i = 0;
// Move start iterator toward first entry.
while( (start != std::begin(entries)) && (i < count / 2) ) {
std::advance(start, -1);
i++;
}
// Move end iterator toward last entry.
while( (end != std::end(entries)) && (i < count) ) {
std::advance(end, 1);
i++;
}
return { start, end };
}
namespace ui { namespace ui {
using RecentEntriesColumn = std::pair<std::string, size_t>; using RecentEntriesColumn = std::pair<std::string, size_t>;
@ -162,7 +164,7 @@ public:
selected = std::begin(recent); selected = std::begin(recent);
} }
auto range = recent.range_around(selected, visible_item_count); auto range = range_around(recent, selected, visible_item_count);
for(auto p = range.first; p != range.second; p++) { for(auto p = range.first; p != range.second; p++) {
const auto& entry = *p; const auto& entry = *p;