From 1e76d690ec1cf41461916bc05c0d1d6ad504e87a Mon Sep 17 00:00:00 2001 From: B0rax Date: Sun, 8 Oct 2023 15:47:30 +0200 Subject: [PATCH] Add circle and rounded box to json template (#143) --- ESP32_AP-Flasher/src/contentmanager.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ESP32_AP-Flasher/src/contentmanager.cpp b/ESP32_AP-Flasher/src/contentmanager.cpp index f1e79c13..a1be1d51 100644 --- a/ESP32_AP-Flasher/src/contentmanager.cpp +++ b/ESP32_AP-Flasher/src/contentmanager.cpp @@ -1393,12 +1393,18 @@ void drawElement(const JsonObject &element, TFT_eSprite &spr) { } else if (element.containsKey("box")) { const JsonArray &boxArray = element["box"]; spr.fillRect(boxArray[0].as(), boxArray[1].as(), boxArray[2].as(), boxArray[3].as(), getColor(boxArray[4])); + } else if (element.containsKey("rbox")) { + const JsonArray &rboxArray = element["rbox"]; + spr.fillRoundRect(rboxArray[0].as(), rboxArray[1].as(), rboxArray[2].as(), rboxArray[3].as(), rboxArray[4].as(), getColor(rboxArray[5])); } else if (element.containsKey("line")) { const JsonArray &lineArray = element["line"]; spr.drawLine(lineArray[0].as(), lineArray[1].as(), lineArray[2].as(), lineArray[3].as(), getColor(lineArray[4])); } else if (element.containsKey("triangle")) { const JsonArray &lineArray = element["triangle"]; spr.fillTriangle(lineArray[0].as(), lineArray[1].as(), lineArray[2].as(), lineArray[3].as(), lineArray[4].as(), lineArray[5].as(), getColor(lineArray[6])); + } else if (element.containsKey("circle")) { + const JsonArray &circleArray = element["circle"]; + spr.fillCircle(circleArray[0].as(), circleArray[1].as(), circleArray[2].as(), getColor(circleArray[3])); } }