Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-15 20:35:17 +03:00
Code Issues Wiki Activity

[Horus] My last commit did break BOLD

Browse source
This commit is contained in:
Bertrand Songis 2016-04-02 20:45:22 +02:00
parent 664a966bbc
commit b0bda14f23
2 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
radio/src/gui/horus/bitmapbuffer.cpp
View file

@ -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)) { if ((flags&INVERS) && ((~flags & BLINK) || BLINK_ON_PHASE)) {
flags = TEXT_INVERTED_COLOR | (flags & 0x0ffff); 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); 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) { 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); 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) { else {
drawSolidFilledRect(x-INVERT_HORZ_MARGIN, y, INVERT_HORZ_MARGIN, INVERT_LINE_HEIGHT, TEXT_INVERTED_BGCOLOR); drawSolidFilledRect(x-INVERT_HORZ_MARGIN, y, width+2*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 (!(flags & NO_FONTCACHE)) { else if (!(flags & NO_FONTCACHE)) {

6
radio/src/gui/horus/lcd.h
View file

@ -68,7 +68,8 @@ enum FontSizeIndex {
SMLSIZE_INDEX, SMLSIZE_INDEX,
MIDSIZE_INDEX, MIDSIZE_INDEX,
DBLSIZE_INDEX, DBLSIZE_INDEX,
XXLSIZE_INDEX XXLSIZE_INDEX,
BOLDSTDSIZE_INDEX,
}; };
#define FONTSIZE(x) ((x) & 0x0700) #define FONTSIZE(x) ((x) & 0x0700)
@ -77,7 +78,8 @@ enum FontSizeIndex {
#define MIDSIZE (MIDSIZE_INDEX << 8) #define MIDSIZE (MIDSIZE_INDEX << 8)
#define DBLSIZE (DBLSIZE_INDEX << 8) #define DBLSIZE (DBLSIZE_INDEX << 8)
#define XXLSIZE (XXLSIZE_INDEX << 8) #define XXLSIZE (XXLSIZE_INDEX << 8)
#define BOLD 0x0600 #define BOLD (BOLDSTDSIZE_INDEX << 8)
#define VERTICAL 0x0800 #define VERTICAL 0x0800
#define TIMEBLINK 0x1000 #define TIMEBLINK 0x1000
#define TIMEHOUR 0x2000 #define TIMEHOUR 0x2000