TheArchive/mayhem-firmware
1
0
Fork 0
mirror of https://github.com/portapack-mayhem/mayhem-firmware.git synced 2025-08-21 12:27:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Hide ui::Point implementation.

Browse Source
This commit is contained in:
Jared Boone
2016-11-28 10:39:10 -08:00
parent 606c1cebac
commit aac2d31548
11 changed files with 78 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
firmware/common/ui_painter.cpp
View File

@@ -39,7 +39,7 @@ Style Style::invert() const {
int Painter::draw_char(const Point p, const Style& style, const char c) {
const auto glyph = style.font.glyph(c);
display.draw_glyph(p, glyph, style.foreground, style.background);
return glyph.advance().x;
return glyph.advance().x();
}
int Painter::draw_string(Point p, const Style& style, const std::string text) {
@@ -49,7 +49,7 @@ int Painter::draw_string(Point p, const Style& style, const std::string text) {
display.draw_glyph(p, glyph, style.foreground, style.background);
const auto advance = glyph.advance();
p += advance;
width += advance.x;
width += advance.x();
}
return width;
}
@@ -68,9 +68,9 @@ void Painter::draw_vline(Point p, int height, const Color c) {
void Painter::draw_rectangle(const Rect r, const Color c) {
draw_hline(r.pos, r.size.w, c);
draw_vline({ r.pos.x, r.pos.y + 1 }, r.size.h - 2, c);
draw_vline({ r.pos.x + r.size.w - 1, r.pos.y + 1 }, r.size.h - 2, c);
draw_hline({ r.pos.x, r.pos.y + r.size.h - 1 }, r.size.w, c);
draw_vline({ r.pos.x(), r.pos.y() + 1 }, r.size.h - 2, c);
draw_vline({ r.pos.x() + r.size.w - 1, r.pos.y() + 1 }, r.size.h - 2, c);
draw_hline({ r.pos.x(), r.pos.y() + r.size.h - 1 }, r.size.w, c);
}
void Painter::fill_rectangle(const Rect r, const Color c) {