TheArchive/mayhem-firmware
1
0
Fork 0
mirror of https://github.com/portapack-mayhem/mayhem-firmware.git synced 2024-12-13 19:54:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

RecentEntriesX: Move non-templated bits to .cpp.

Browse Source
This commit is contained in:
Jared Boone 2016-09-05 16:49:44 -07:00
parent 722f9b6886
commit 2740761ed7
2 changed files with 42 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
firmware/application/recent_entries.cpp
View File

@ -20,3 +20,42 @@
*/ */
#include "recent_entries.hpp" #include "recent_entries.hpp"
namespace ui {
RecentEntriesColumns::RecentEntriesColumns(
const std::initializer_list<RecentEntriesColumn> columns
) : _columns { columns }
{
}
RecentEntriesHeader::RecentEntriesHeader(
const RecentEntriesColumns& columns
) : _columns { columns }
{
}
void RecentEntriesHeader::paint(Painter& painter) {
const auto r = screen_rect();
const auto& parent_style = style();
const Style style {
.font = parent_style.font,
.background = Color::blue(),
.foreground = parent_style.foreground,
};
auto p = r.pos;
for(const auto& column : _columns) {
const auto width = column.second;
auto text = column.first;
if( width > text.length() ) {
text.append(width - text.length(), ' ');
}
painter.draw_string(p, style, text);
p += { static_cast<Coord>((width * 8) + 8), 0 };
}
}
} /* namespace ui */

31
firmware/application/recent_entries.hpp
View File

@ -101,9 +101,7 @@ public:
RecentEntriesColumns( RecentEntriesColumns(
const std::initializer_list<RecentEntriesColumn> columns const std::initializer_list<RecentEntriesColumn> columns
) : _columns { columns } );
{
}
ContainerType::const_iterator begin() const { return std::begin(_columns); } ContainerType::const_iterator begin() const { return std::begin(_columns); }
ContainerType::const_iterator end() const { return std::end(_columns); } ContainerType::const_iterator end() const { return std::end(_columns); }
@ -116,32 +114,9 @@ class RecentEntriesHeader : public Widget {
public: public:
RecentEntriesHeader( RecentEntriesHeader(
const RecentEntriesColumns& columns const RecentEntriesColumns& columns
) : _columns { columns } );
{
}
void paint(Painter& painter) override { void paint(Painter& painter) override;
const auto r = screen_rect();
const auto& parent_style = style();
const Style style {
.font = parent_style.font,
.background = Color::blue(),
.foreground = parent_style.foreground,
};
auto p = r.pos;
for(const auto& column : _columns) {
const auto width = column.second;
auto text = column.first;
if( width > text.length() ) {
text.append(width - text.length(), ' ');
}
painter.draw_string(p, style, text);
p += { static_cast<Coord>((width * 8) + 8), 0 };
}
}
private: private:
const RecentEntriesColumns& _columns; const RecentEntriesColumns& _columns;