diff --git a/radio/src/thirdparty/libopenui/src/bitmapbuffer.cpp b/radio/src/thirdparty/libopenui/src/bitmapbuffer.cpp index 078ebdf7b..501377e7e 100755 --- a/radio/src/thirdparty/libopenui/src/bitmapbuffer.cpp +++ b/radio/src/thirdparty/libopenui/src/bitmapbuffer.cpp @@ -41,7 +41,7 @@ void BitmapBuffer::drawAlphaPixel(pixel_t * p, uint8_t opacity, uint16_t color) } } -void BitmapBuffer::drawHorizontalLine(coord_t x, coord_t y, coord_t w, uint8_t pat, LcdFlags att) +void BitmapBuffer::drawHorizontalLine(coord_t x, coord_t y, coord_t w, uint8_t pat, LcdFlags flags) { APPLY_OFFSET(); @@ -53,8 +53,8 @@ void BitmapBuffer::drawHorizontalLine(coord_t x, coord_t y, coord_t w, uint8_t p } pixel_t * p = getPixelPtr(x, y); - pixel_t color = lcdColorTable[COLOR_IDX(att)]; - uint8_t opacity = 0x0F - (att >> 24); + pixel_t color = lcdColorTable[COLOR_IDX(flags)]; + uint8_t opacity = 0x0F - (flags >> 24); if (pat == SOLID) { while (w--) { @@ -76,7 +76,7 @@ void BitmapBuffer::drawHorizontalLine(coord_t x, coord_t y, coord_t w, uint8_t p } } -void BitmapBuffer::drawVerticalLine(coord_t x, coord_t y, coord_t h, uint8_t pat, LcdFlags att) +void BitmapBuffer::drawVerticalLine(coord_t x, coord_t y, coord_t h, uint8_t pat, LcdFlags flags) { APPLY_OFFSET(); @@ -100,8 +100,8 @@ void BitmapBuffer::drawVerticalLine(coord_t x, coord_t y, coord_t h, uint8_t pat if (h <= 0) return; - pixel_t color = lcdColorTable[COLOR_IDX(att)]; - uint8_t opacity = 0x0F - (att >> 24); + pixel_t color = lcdColorTable[COLOR_IDX(flags)]; + uint8_t opacity = 0x0F - (flags >> 24); if (pat == SOLID) { while (h--) { @@ -177,13 +177,13 @@ void BitmapBuffer::drawLine(coord_t x1, coord_t y1, coord_t x2, coord_t y2, uint } } -void BitmapBuffer::drawRect(coord_t x, coord_t y, coord_t w, coord_t h, uint8_t thickness, uint8_t pat, LcdFlags att) +void BitmapBuffer::drawRect(coord_t x, coord_t y, coord_t w, coord_t h, uint8_t thickness, uint8_t pat, LcdFlags flags) { for (int i=0; idrawSolidFilledRect(x, y, thickness, h, att); - dc->drawSolidFilledRect(x+w-thickness, y, thickness, h, att); - dc->drawSolidFilledRect(x, y, w, thickness, att); - dc->drawSolidFilledRect(x, y+h-thickness, w, thickness, att); + dc->drawSolidFilledRect(x, y, thickness, h, flags); + dc->drawSolidFilledRect(x+w-thickness, y, thickness, h, flags); + dc->drawSolidFilledRect(x, y, w, thickness, flags); + dc->drawSolidFilledRect(x, y+h-thickness, w, thickness, flags); } //void BitmapBuffer::drawBitmapPie(int x0, int y0, const uint16_t * img, int startAngle, int endAngle)