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

Merge with latest 2.3

Browse Source
This commit is contained in:
Bertrand Songis
2020-05-30 11:57:02 +02:00
parent 41cace6e2e
commit 924627cd1d
4 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/thirdparty/libopenui/src/bitmapbuffer.cpp
Vendored
+2 -2
View File
@@ -562,11 +562,11 @@ coord_t BitmapBuffer::drawSizedText(coord_t x, coord_t y, const char * s, uint8_
c -= 1;
c += CJK_FIRST_LETTER_INDEX;
uint8_t width = drawChar(x, y, font, fontspecs, c, flags);
INCREMENT_POS(width + 1);
INCREMENT_POS(width + CHAR_SPACING);
}
else if (c >= 0x20) {
uint8_t width = drawChar(x, y, font, fontspecs, getMappedChar(c), flags);
INCREMENT_POS(width + 1);
INCREMENT_POS(width + CHAR_SPACING);
}
else if (c == '\n') {
pos = orig_pos;
radio/src/thirdparty/libopenui/src/button.cpp
Vendored
+3 -1
View File
@@ -102,7 +102,9 @@ void TextButton::paint(BitmapBuffer * dc)
}
}
dc->drawText(rect.w / 2, (rect.h - getFontHeight(textFlags)) / 2, text.c_str(), CENTERED | textFlags | textColor);
TRACE("ICI text=%s rect.h=%d fontHeight=%d", text.c_str(), rect.h, getFontHeight(textFlags));
dc->drawText(rect.w / 2, 1 + (rect.h - getFontHeight(textFlags)) / 2, text.c_str(), CENTERED | textFlags | textColor);
}
void IconButton::paint(BitmapBuffer * dc)
radio/src/thirdparty/libopenui/src/form.cpp
Vendored
+1 -1
View File
@@ -110,7 +110,7 @@ void FormGroup::addField(FormField * field, bool front)
link(last, field);
last = field;
}
if (windowFlags & FORM_FORWARD_FOCUS) {
if (previous && (windowFlags & FORM_FORWARD_FOCUS)) {
last->setNextField(this);
link(previous, first);
}
radio/src/thirdparty/libopenui/src/static.cpp
Vendored
+1 -1
View File
@@ -25,7 +25,7 @@ void StaticText::paint(BitmapBuffer * dc)
if (windowFlags & BUTTON_BACKGROUND)
dc->drawSolidFilledRect(0, 0, rect.w, rect.h, DISABLE_COLOR);
if (textFlags & CENTERED)
dc->drawText(rect.w / 2, (1 + rect.h - getFontHeight(textFlags)) / 2, text.c_str(), textFlags);
dc->drawText(rect.w / 2, 1 + (rect.h - getFontHeight(textFlags)) / 2, text.c_str(), textFlags);
else if (textFlags & RIGHT)
dc->drawText(rect.w, FIELD_PADDING_TOP, text.c_str(), textFlags);
else