Update to latest libopenui

This commit is contained in:
Bertrand Songis
2020-06-18 12:17:23 +02:00
parent fb7787555e
commit bb59e8539f
3 changed files with 6 additions and 12 deletions
+2 -8
View File
@@ -167,16 +167,10 @@ void drawHorizontalSlider(BitmapBuffer * dc, coord_t x, coord_t y, int len, int
else {
dc->drawBitmapPattern(x, y + 2, LBM_SLIDER_POINT_OUT, DEFAULT_COLOR);
dc->drawBitmapPattern(x, y + 2, LBM_SLIDER_POINT_MID, DEFAULT_BGCOLOR);
if ((options & INVERS) && (!(options & BLINK) || !BLINK_ON_PHASE))
dc->drawBitmapPattern(x, y + 2, LBM_SLIDER_POINT_IN, FOCUS_BGCOLOR);
dc->drawBitmapPattern(x, y + 2, LBM_SLIDER_POINT_IN, FOCUS_BGCOLOR);
}
}
bool noZero(int val)
{
return val != 0;
}
void drawGVarValue(BitmapBuffer * dc, coord_t x, coord_t y, uint8_t gvar, gvar_t value, LcdFlags flags)
{
uint8_t prec = g_model.gvars[gvar].prec;
@@ -487,7 +481,7 @@ void drawSourceCustomValue(BitmapBuffer * dc, coord_t x, coord_t y, source_t sou
drawSensorCustomValue(dc, y, source, value, flags);
}
else if (source >= MIXSRC_FIRST_TIMER || source == MIXSRC_TX_TIME) {
if (value < 0) flags |= BLINK|INVERS;
// TODO if (value < 0) flags |= BLINK|INVERS;
// TODO drawTimer(dc, x, y, value, flags);
}
else if (source == MIXSRC_TX_VOLTAGE) {
+3 -3
View File
@@ -48,8 +48,8 @@ class RadioKeyDiagsWindow : public Window
char status[2];
status[0] = t + '0';
status[1] = '\0';
dc->drawText(x, y, status, t ? INVERS : 0);
// TODO INVERS?
dc->drawText(x, y, status, 0);
}
void paint(BitmapBuffer * dc) override
@@ -70,7 +70,7 @@ class RadioKeyDiagsWindow : public Window
dc->drawText(TRIM_PLUS_COLUMN, 1, "+");
#if !defined(PCBNV14)
//KEYS
// KEYS
for (uint8_t i = KEY_START; i <= 6; i++) {
coord_t y = 1 + FH * (i - KEY_START);
dc->drawTextAtIndex(KEY_COLUMN, y, STR_VKEYS, i, 0);