Git-Mirrors/portapack-mayhem
1
0
Fork 0
mirror of https://github.com/eried/portapack-mayhem.git synced 2025-08-10 07:30:08 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge 'upstream/master' - At least it builds...

Browse source
This commit is contained in:
furrtek 2017-01-16 03:45:44 +00:00
commit 5e40669cbc
298 changed files with 8122 additions and 4685 deletions
Download patch file Download diff file Expand all files Collapse all files

12
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;
}
@ -67,10 +67,10 @@ 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_hline(r.location(), r.width(), c);
draw_vline({ r.left(), r.top() + 1 }, r.height() - 2, c);
draw_vline({ r.left() + r.width() - 1, r.top() + 1 }, r.height() - 2, c);
draw_hline({ r.left(), r.top() + r.height() - 1 }, r.width(), c);
}
void Painter::fill_rectangle(const Rect r, const Color c) {