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

Merge pull request #205 from yaapu/pr/colorlcd_fix_right_invers

Browse Source 
colorlcd: lua fix INVERS+RIGHT in drawText, drawNumber
This commit is contained in:
Raphael Coeffic
2021-06-14 17:50:29 +02:00
committed by GitHub
parent f3fbed5a1b 1f62bab4f1
commit bfc87f547c
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/lua/api_colorlcd.cpp
+10 -2
View File
@@ -243,8 +243,12 @@ static int luaLcdDrawText(lua_State *L)
if (invers) {
int height = getFontHeight(att & 0xFFFF);
int width = getTextWidth(s, 255, att);
int ix = x - INVERT_BOX_MARGIN;
if (att & RIGHT) {
ix = x - width - INVERT_BOX_MARGIN;
}
luaLcdBuffer->drawSolidFilledRect(
x - INVERT_BOX_MARGIN, y - INVERT_BOX_MARGIN,
ix, y - INVERT_BOX_MARGIN,
width + 2 * INVERT_BOX_MARGIN, height + 2 * INVERT_BOX_MARGIN,
FOCUS_BGCOLOR);
att = (att & 0xFFFF) | FOCUS_COLOR;
@@ -338,8 +342,12 @@ static int luaLcdDrawNumber(lua_State *L)
if (invers) {
int height = getFontHeight(att & 0xFFFF);
int width = getTextWidth(s, 255, att);
int ix = x - INVERT_BOX_MARGIN;
if (att & RIGHT) {
ix = x - width - INVERT_BOX_MARGIN;
}
luaLcdBuffer->drawSolidFilledRect(
x - INVERT_BOX_MARGIN, y - INVERT_BOX_MARGIN,
ix, y - INVERT_BOX_MARGIN,
width + 2 * INVERT_BOX_MARGIN, height + 2 * INVERT_BOX_MARGIN,
FOCUS_BGCOLOR);
att = (att & 0xFFFF) | FOCUS_COLOR;