TheArchive/mayhem-firmware
1
0
Fork 0
mirror of https://github.com/portapack-mayhem/mayhem-firmware.git synced 2025-12-03 12:31:49 +00:00
Code Issues Packages Projects Releases 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
parent f39954856e 052fd1c407
commit 5e40669cbc
298 changed files with 8122 additions and 4685 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
firmware/application/ui_alphanum.cpp
View File

@@ -66,12 +66,12 @@ AlphanumView::AlphanumView(
txtidx--;
}
add_children({ {
add_children({
&text_input,
&button_lowercase,
&raw_char,
&button_ok
} });
});
const auto button_fn = [this](Button& button) {
this->on_button(button);
@@ -124,11 +124,11 @@ AlphanumView::AlphanumView(
void AlphanumView::move_cursor() {
Point cursor_pos;
cursor_pos.x = text_input.screen_rect().pos.x + (txtidx * 8);
cursor_pos.y = text_input.screen_rect().pos.y + 16;
cursor_pos = {text_input.screen_rect().location().x() + (txtidx * 8),
text_input.screen_rect().location().y() + 16};
portapack::display.fill_rectangle(
{{text_input.screen_rect().pos.x, cursor_pos.y}, {text_input.screen_rect().size.w, 4}},
{{text_input.screen_rect().location().x(), cursor_pos.y()}, {text_input.screen_rect().size().width(), 4}},
Color::black()
);
portapack::display.fill_rectangle(