Git-Mirrors/portapack-mayhem
1
0
Fork 0
mirror of https://github.com/eried/portapack-mayhem.git synced 2025-12-24 03:51:01 -05: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/application/ui_about.cpp
View file

@ -52,7 +52,7 @@ void AboutView::update() {
} else {
// Find a free text widget
for (c = 0; c < 10; c++)
if (text_line[c].screen_pos().y >= 200) break;
if (text_line[c].screen_pos().y() >= 200) break;
if (c < 10) {
flag = credits[credits_index].flag & 0x3F;
@ -106,13 +106,13 @@ void AboutView::update() {
// Scroll text lines
for (c = 0; c < 10; c++) {
y_val = text_line[c].screen_pos().y - 16;
y_val = text_line[c].screen_pos().y() - 16;
if (y_val < 32) {
text_line[c].set_parent_rect({{ text_line[c].screen_pos().x, 200 }, { text_line[c].size() }});
text_line[c].set_parent_rect({{ text_line[c].screen_pos().x(), 200 }, { text_line[c].size() }});
text_line[c].hidden(true);
} else {
if (y_val < 200) {
text_line[c].set_parent_rect({{ text_line[c].screen_pos().x, y_val - 1 }, { text_line[c].size() }});
text_line[c].set_parent_rect({{ text_line[c].screen_pos().x(), y_val - 1 }, { text_line[c].size() }});
n = (y_val - 32) >> 2;
if (n > 19)
n = (38 - n);
@ -134,11 +134,11 @@ AboutView::AboutView(
{
//uint8_t p, c;
add_children({ {
add_children({
&text_cpld_hackrf,
&text_cpld_hackrf_status,
&button_ok,
} });
});
for (auto& text : text_line) {
text.set("");