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

[Horus] In MODEL SETUP screen BEEP center settings are visible even when INVERS

Browse Source
This commit is contained in:
Bertrand Songis
2016-06-08 19:41:44 +02:00
parent 177f672619
commit 238ef2be38
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/horus/bitmapbuffer.cpp
+12 -4
View File
@@ -326,11 +326,19 @@ void BitmapBuffer::drawSizedText(coord_t x, coord_t y, const char * s, uint8_t l
coord_t & pos = (flags & VERTICAL) ? y : x;
if ((flags&INVERS) && ((~flags & BLINK) || BLINK_ON_PHASE)) {
flags = TEXT_INVERTED_COLOR | (flags & 0x0ffff);
uint16_t fgColor = lcdColorTable[COLOR_IDX(flags)];
if (fgColor == lcdColorTable[TEXT_COLOR_INDEX]) {
flags = TEXT_INVERTED_COLOR | (flags & 0x0ffff);
}
if (fontindex == STDSIZE_INDEX) {
drawSolidFilledRect(x-INVERT_HORZ_MARGIN, y, INVERT_HORZ_MARGIN-1, INVERT_LINE_HEIGHT, TEXT_INVERTED_BGCOLOR);
drawSolidFilledRect(x+width-1, y, INVERT_HORZ_MARGIN, INVERT_LINE_HEIGHT, TEXT_INVERTED_BGCOLOR);
fontcache = fontCache[1];
if (fgColor == lcdColorTable[TEXT_COLOR_INDEX]) {
drawSolidFilledRect(x-INVERT_HORZ_MARGIN, y, INVERT_HORZ_MARGIN-1, INVERT_LINE_HEIGHT, TEXT_INVERTED_BGCOLOR);
drawSolidFilledRect(x+width-1, y, INVERT_HORZ_MARGIN, INVERT_LINE_HEIGHT, TEXT_INVERTED_BGCOLOR);
fontcache = fontCache[1];
}
else {
drawSolidFilledRect(x-INVERT_HORZ_MARGIN, y, width+2*INVERT_HORZ_MARGIN-1, INVERT_LINE_HEIGHT, TEXT_INVERTED_BGCOLOR);
}
}
else if (fontindex == TINSIZE_INDEX) {
drawSolidFilledRect(x-INVERT_HORZ_MARGIN+2, y-INVERT_VERT_MARGIN+2, width+2*INVERT_HORZ_MARGIN-5, INVERT_LINE_HEIGHT-7, TEXT_INVERTED_BGCOLOR);