diff --git a/radio/src/gui/horus/bitmapbuffer.cpp b/radio/src/gui/horus/bitmapbuffer.cpp index 93c9764d5..f9084e59d 100644 --- a/radio/src/gui/horus/bitmapbuffer.cpp +++ b/radio/src/gui/horus/bitmapbuffer.cpp @@ -279,16 +279,19 @@ void BitmapBuffer::drawSizedText(coord_t x, coord_t y, const char * s, uint8_t l if ((flags&INVERS) && ((~flags & BLINK) || BLINK_ON_PHASE)) { flags = TEXT_INVERTED_COLOR | (flags & 0x0ffff); - if (fontindex == TINSIZE_INDEX) { + if (fontindex == STDSIZE_INDEX) { + drawSolidFilledRect(x-INVERT_HORZ_MARGIN, y, INVERT_HORZ_MARGIN, INVERT_LINE_HEIGHT, TEXT_INVERTED_BGCOLOR); + drawSolidFilledRect(x+width, y, INVERT_HORZ_MARGIN, INVERT_LINE_HEIGHT, TEXT_INVERTED_BGCOLOR); + fontcache = fontCache[1]; + } + 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); } else if (fontindex == SMLSIZE_INDEX) { drawSolidFilledRect(x-INVERT_HORZ_MARGIN, y+1, width+2*INVERT_HORZ_MARGIN-2, INVERT_LINE_HEIGHT-5, TEXT_INVERTED_BGCOLOR); } - else if (fontindex == STDSIZE_INDEX) { - drawSolidFilledRect(x-INVERT_HORZ_MARGIN, y, INVERT_HORZ_MARGIN, INVERT_LINE_HEIGHT, TEXT_INVERTED_BGCOLOR); - drawSolidFilledRect(x+width, 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, INVERT_LINE_HEIGHT, TEXT_INVERTED_BGCOLOR); } } else if (!(flags & NO_FONTCACHE)) { diff --git a/radio/src/gui/horus/lcd.h b/radio/src/gui/horus/lcd.h index b97775e93..d98a495e7 100644 --- a/radio/src/gui/horus/lcd.h +++ b/radio/src/gui/horus/lcd.h @@ -68,7 +68,8 @@ enum FontSizeIndex { SMLSIZE_INDEX, MIDSIZE_INDEX, DBLSIZE_INDEX, - XXLSIZE_INDEX + XXLSIZE_INDEX, + BOLDSTDSIZE_INDEX, }; #define FONTSIZE(x) ((x) & 0x0700) @@ -77,7 +78,8 @@ enum FontSizeIndex { #define MIDSIZE (MIDSIZE_INDEX << 8) #define DBLSIZE (DBLSIZE_INDEX << 8) #define XXLSIZE (XXLSIZE_INDEX << 8) -#define BOLD 0x0600 +#define BOLD (BOLDSTDSIZE_INDEX << 8) + #define VERTICAL 0x0800 #define TIMEBLINK 0x1000 #define TIMEHOUR 0x2000