Re #1926: SMLSIZE last line drawn, gtests expanded with LCD character overlapped test
@@ -113,7 +113,7 @@ void lcdPutPattern(coord_t x, coord_t y, const uint8_t * pattern, uint8_t width,
|
||||
|
||||
for (int8_t j=-1; j<=height; j++) {
|
||||
bool plot;
|
||||
if (j < 0 || j == height) {
|
||||
if (j < 0 || ((j == height) && !(FONTSIZE(flags) == SMLSIZE))) {
|
||||
plot = false;
|
||||
if (height >= 12) continue;
|
||||
if (j<0 && !inv) continue;
|
||||
|
||||
|
Before Width: | Height: | Size: 513 B After Width: | Height: | Size: 706 B |
|
Before Width: | Height: | Size: 558 B After Width: | Height: | Size: 749 B |
@@ -210,6 +210,13 @@ TEST(Lcd, Smlsize)
|
||||
lcd_putsAtt(10, 22, "TESTgy,", SMLSIZE|INVERS);
|
||||
lcd_filled_rect(8, 40, 100, 20);
|
||||
lcd_putsAtt(10, 42, "TESTgy,", SMLSIZE);
|
||||
|
||||
bool invert = false;
|
||||
for(int i=0; i<3; i++) {
|
||||
lcd_putsAtt(40+(4*i), 0+(4*i), "ABC", SMLSIZE|(invert?INVERS:0));
|
||||
invert = !invert;
|
||||
}
|
||||
|
||||
EXPECT_TRUE(checkScreenshot("smlsize"));
|
||||
}
|
||||
|
||||
@@ -220,6 +227,13 @@ TEST(Lcd, Stdsize)
|
||||
lcd_putsAtt(10, 22, "TEST", INVERS);
|
||||
lcd_filled_rect(8, 40, 100, 20);
|
||||
lcd_putsAtt(10, 42, "TEST", 0);
|
||||
|
||||
bool invert = false;
|
||||
for(int i=0; i<3; i++) {
|
||||
lcd_putsAtt(40+(4*i), 0+(4*i), "ABC", (invert?INVERS:0));
|
||||
invert = !invert;
|
||||
}
|
||||
|
||||
EXPECT_TRUE(checkScreenshot("stdsize"));
|
||||
}
|
||||
|
||||
@@ -230,6 +244,13 @@ TEST(Lcd, Midsize)
|
||||
lcd_putsAtt(10, 22, "TEST", MIDSIZE|INVERS);
|
||||
lcd_filled_rect(8, 40, 100, 20);
|
||||
lcd_putsAtt(10, 42, "TEST", MIDSIZE);
|
||||
|
||||
bool invert = false;
|
||||
for(int i=0; i<3; i++) {
|
||||
lcd_putsAtt(40+(4*i), 0+(4*i), "ABC", MIDSIZE|(invert?INVERS:0));
|
||||
invert = !invert;
|
||||
}
|
||||
|
||||
EXPECT_TRUE(checkScreenshot("midsize"));
|
||||
}
|
||||
|
||||
@@ -240,6 +261,13 @@ TEST(Lcd, Dblsize)
|
||||
lcd_putsAtt(42, 10, "TST", DBLSIZE|INVERS);
|
||||
lcd_filled_rect(80, 8, 46, 24);
|
||||
lcd_putsAtt(82, 10, "TST", DBLSIZE);
|
||||
|
||||
bool invert = false;
|
||||
for(int i=0; i<3; i++) {
|
||||
lcd_putsAtt(10+(4*i), 30+(4*i), "ABC", DBLSIZE|(invert?INVERS:0));
|
||||
invert = !invert;
|
||||
}
|
||||
|
||||
EXPECT_TRUE(checkScreenshot("dblsize"));
|
||||
}
|
||||
#endif
|
||||
|
||||
|
Before Width: | Height: | Size: 503 B After Width: | Height: | Size: 694 B |
|
Before Width: | Height: | Size: 532 B After Width: | Height: | Size: 730 B |
|
Before Width: | Height: | Size: 527 B After Width: | Height: | Size: 657 B |
|
Before Width: | Height: | Size: 560 B After Width: | Height: | Size: 709 B |
|
Before Width: | Height: | Size: 483 B After Width: | Height: | Size: 590 B |
|
Before Width: | Height: | Size: 507 B After Width: | Height: | Size: 619 B |