starred/OpenEPaperLink
1
0
Fork 0
mirror of https://github.com/OpenEPaperLink/OpenEPaperLink.git synced 2026-03-21 09:04:24 +01:00
Code Issues 1.0k Packages Projects Releases 10 Wiki Activity

optional border color and -width in box and rbox json template

Browse Source
This commit is contained in:
Nic Limper
2024-12-11 14:12:26 +01:00
parent d8dcd498a3
commit e246ac578d
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ESP32_AP-Flasher/src/contentmanager.cpp
View File

@@ -2262,9 +2262,22 @@ void drawElement(const JsonObject &element, TFT_eSprite &spr, imgParam &imagePar
} else if (element.containsKey("box")) {
const JsonArray &boxArray = element["box"];
spr.fillRect(boxArray[0].as<int>(), boxArray[1].as<int>(), boxArray[2].as<int>(), boxArray[3].as<int>(), getColor(boxArray[4]));
if (boxArray.size()>=7) {
for (int i=0; i < boxArray[6].as<int>(); i++) {
spr.drawRect(boxArray[0].as<int>() + i, boxArray[1].as<int>() + i, boxArray[2].as<int>() - 2 * i, boxArray[3].as<int>() - 2 * i, getColor(boxArray[5]));
}
}
} else if (element.containsKey("rbox")) {
const JsonArray &rboxArray = element["rbox"];
spr.fillRoundRect(rboxArray[0].as<int>(), rboxArray[1].as<int>(), rboxArray[2].as<int>(), rboxArray[3].as<int>(), rboxArray[4].as<int>(), getColor(rboxArray[5]));
if (rboxArray.size() >= 8) {
for (int i = 0; i < rboxArray[7].as<int>(); i++) {
spr.drawRoundRect(rboxArray[0].as<int>() + i, rboxArray[1].as<int>() + i, rboxArray[2].as<int>() - 2 * i, rboxArray[3].as<int>() - 2 * i, rboxArray[4].as<int>() - i / 1.41, getColor(rboxArray[6]));
if (i > 0) {
spr.drawRoundRect(rboxArray[0].as<int>() + i - 1, rboxArray[1].as<int>() + i, rboxArray[2].as<int>() - 2 * i + 2, rboxArray[3].as<int>() - 2 * i, rboxArray[4].as<int>() - i / 1.41, getColor(rboxArray[6]));
}
}
}
} else if (element.containsKey("line")) {
const JsonArray &lineArray = element["line"];
spr.drawLine(lineArray[0].as<int>(), lineArray[1].as<int>(), lineArray[2].as<int>(), lineArray[3].as<int>(), getColor(lineArray[4]));