TheArchive/mayhem-firmware
1
0
Fork 0
mirror of https://github.com/portapack-mayhem/mayhem-firmware.git synced 2025-08-20 04:37:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add ability to draw text with a transparent background

Browse Source 
(cherry picked from commit a15da2e136147b31ab53058871815c8eb759576a)
This commit is contained in:
heurist1
2023-02-28 19:00:11 +00:00
parent 86203f090f
commit b549d3a4f1
1 changed files with 28 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
firmware/common/lcd_ili9341.cpp
View File

@@ -606,6 +606,9 @@ void ILI9341::draw_bitmap(
const ui::Color foreground, const ui::Color foreground,
const ui::Color background const ui::Color background
) { ) {
// Not a transparent background
if (ui::Color::magenta().v!=background.v)
{
lcd_start_ram_write(p, size); lcd_start_ram_write(p, size);
const size_t count = size.width() * size.height(); const size_t count = size.width() * size.height();
@@ -614,6 +617,26 @@ void ILI9341::draw_bitmap(
io.lcd_write_pixel(pixel ? foreground : background); io.lcd_write_pixel(pixel ? foreground : background);
} }
} }
else
{
int x = p.x();
int y = p.y();
int maxX = x + size.width();
const size_t count = size.width() * size.height();
for(size_t i=0; i<count; i++) {
const auto pixel = pixels[i >> 3] & (1U << (i & 0x7));
if (pixel) {
draw_pixel(ui::Point(x,y), foreground);
}
// Move to the next pixel
x++;
if (x>=maxX){
x = p.x();
y++;
}
}
}
}
void ILI9341::draw_glyph( void ILI9341::draw_glyph(
const ui::Point p, const ui::Point p,