piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

lcdNextPos not needed anymore

Browse Source
This commit is contained in:
Bertrand Songis
2019-10-19 19:26:14 +02:00
parent 71bb4cfaa3
commit 9bf7563a02
2 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/colorlcd/radio_version.cpp
+12 -15
View File
@@ -29,10 +29,10 @@ class OptionsText : public StaticText {
StaticText(parent, rect)
{
coord_t optionWidth = 0;
for (uint8_t i=0; options[i]; i++) {
for (uint8_t i = 0; options[i]; i++) {
const char * option = options[i];
optionWidth+= getTextWidth(option);
if(optionWidth + 5 > width()) {
optionWidth += getTextWidth(option);
if (optionWidth + 5 > width()) {
setHeight(getHeight() + 20);
optionWidth = 0;
}
@@ -42,23 +42,20 @@ class OptionsText : public StaticText {
void paint(BitmapBuffer * dc) override
{
coord_t y = 0;
lcdNextPos = 0;
for (uint8_t i=0; options[i]; i++) {
coord_t x = 0;
for (uint8_t i = 0; options[i]; i++) {
const char * option = options[i];
coord_t optionWidth = getTextWidth(option);
if (lcdNextPos + 5 + optionWidth > width()) {
dc->drawText(lcdNextPos, y, ",");
lcdNextPos = 0;
if (x + 5 + optionWidth > width()) {
dc->drawText(x, y, ",");
x = 0;
y += FH;
}
if (i > 0 && lcdNextPos != 0)
dc->drawText(lcdNextPos, y, ", ");
dc->drawText(lcdNextPos, y, option);
}
if (i > 0 && x != 0)
x = dc->drawText(x, y, ", ");
x = dc->drawText(x, y, option);
}
}
protected:
};
RadioVersionPage::RadioVersionPage():
radio/src/thirdparty/libopenui
Vendored
+1 -1
Submodule radio/src/thirdparty/libopenui updated: 3951b55749...5b4ee51fe3