Prepare for 3.0 docs and small fix

Author: dave

examples/esp/esp32s3TftEncoder/esp32s3TftEncoder.emf

@@ -177,7 +177,7 @@
       },
       {
         "name": "DOUBLE_BUFFER_ROWS",
-        "latestValue": "2",
+        "latestValue": "20",
         "subsystem": "DISPLAY"
       },
       {
@@ -232,12 +232,12 @@
       },
       {
         "name": "ITEM_FONT",
-        "latestValue": "num:,2",
+        "latestValue": "ada:OpenSansCyrillicLatin12,0",
         "subsystem": "THEME"
       },
       {
         "name": "TITLE_FONT",
-        "latestValue": "num:,2",
+        "latestValue": "ada:OpenSansCyrillicLatin12,0",
         "subsystem": "THEME"
       },
       {
@@ -250,6 +250,11 @@
         "latestValue": "TITLE_FIRST_ROW",
         "subsystem": "THEME"
       },
+      {
+        "name": "USE_TC_UNICODE",
+        "latestValue": "true",
+        "subsystem": "THEME"
+      },
       {
         "name": "USE_SLIDER_ANALOG",
         "latestValue": "true",

examples/esp/esp32s3TftEncoder/esp32s3TftEncoder.ino

@@ -1,3 +1,5 @@
+// PLEASE CHOOSE ANOTHER EXAMPLE
+// This is more of a test harness for developer testing than an example
 // Getting started: https://www.thecoderscorner.com/products/arduino-libraries/tc-menu/tcmenu-overview-quick-start/
 
 #include "esp32s3TftEncoder_menu.h"

examples/esp/esp32s3TftEncoder/esp32s3TftEncoder.ino.backup

@@ -11,12 +11,13 @@
 #include <tcMenu.h>
 #include "esp32s3TftEncoder_menu.h"
 #include "ThemeCoolBlueTraditional.h"
+#include <Fonts/OpenSansCyrillicLatin12.h>
 
 // Global variable declarations
 const  ConnectorLocalInfo applicationInfo = { "ESP32 S3 Tiny", "c035e186-32cc-45e4-ac28-773f57e108ee" };
 
 TFT_eSPI gfx;
-TfteSpiDrawable gfxDrawable(&gfx, 2);
+TfteSpiDrawable gfxDrawable(&gfx, 20);
 GraphicsDeviceRenderer renderer(30, applicationInfo.name, &gfxDrawable);
 
 // Global Menu Item declarations
@@ -56,6 +57,7 @@ void setupMenu() {
     menuMgr.initForEncoder(&renderer, &menuPercent, 3, 4, 5);
     renderer.setTitleMode(BaseGraphicalRenderer::TITLE_FIRST_ROW);
     renderer.setUseSliderForAnalog(true);
-    installCoolBlueTraditionalTheme(renderer, MenuFontDef(nullptr, 2), MenuFontDef(nullptr, 2), true);
+    renderer.enableTcUnicode();
+    installCoolBlueTraditionalTheme(renderer, MenuFontDef(&OpenSansCyrillicLatin12, 0), MenuFontDef(&OpenSansCyrillicLatin12, 0), true);
 }
 

examples/esp/esp32s3TftEncoder/esp32s3TftEncoder_menu.cpp

@@ -13,6 +13,7 @@
 
 #include <Arduino.h>
 #include <tcMenu.h>
+#include <tcUnicodeHelper.h>
 #include "tcMenuTfteSpi.h"
 #include <graphics/MenuTouchScreenEncoder.h>
 #include <RuntimeMenuItem.h>
@@ -25,6 +26,7 @@ extern const PROGMEM ConnectorLocalInfo applicationInfo;
 extern TFT_eSPI gfx;
 extern TfteSpiDrawable gfxDrawable;
 extern GraphicsDeviceRenderer renderer;
+extern const UnicodeFont OpenSansCyrillicLatin12[];
 
 // Any externals needed by IO expanders, EEPROMs etc
 

examples/esp/esp32s3TftEncoder/esp32s3TftEncoder_menu.h

@@ -12,8 +12,8 @@
  * This library requires the AdaGfx library along with a suitable driver.
  */
 
-
 #include "tcMenuTfteSpi.h"
+#include "tcUnicodeHelper.h"
 #include <TFT_eSPI.h>
 
 TfteSpiDrawable::TfteSpiDrawable(TFT_eSPI *tft, int spriteHeight) : tft(tft), spriteWithConfig(nullptr), spriteHeight(spriteHeight) {}
@@ -30,7 +30,7 @@ DeviceDrawable *TfteSpiDrawable::getSubDeviceFor(const Coord &where, const Coord
     else return nullptr;
 }
 
-void TfteSpiDrawable::drawText(const Coord &where, const void *font, int mag, const char *text) {
+void TfteSpiDrawable::internalDrawText(const Coord &where, const void *font, int mag, const char *text) {
     fontPtrToNum(font, mag);
     tft->setTextColor(drawColor, drawColor); // transparent background
     tft->drawString(text, where.x, where.y);
@@ -88,12 +88,16 @@ void TfteSpiDrawable::transaction(bool isStarting, bool redrawNeeded) {
     if(isStarting) tft->setTextDatum(TL_DATUM);
 }
 
-Coord TfteSpiDrawable::textExtents(const void *font, int mag, const char *text, int *baseline) {
+Coord TfteSpiDrawable::internalTextExtents(const void *font, int mag, const char *text, int *baseline) {
     if(baseline) *baseline = 0;
     fontPtrToNum(font, mag);
     return Coord(tft->textWidth(text), tft->fontHeight());
 }
 
+void TfteSpiDrawable::drawPixel(uint16_t x, uint16_t y) {
+    tft->drawPixel(x, y, drawColor);
+}
+
 void TfteSpiDrawable::fontPtrToNum(const void* font, int mag) {
     if(font == nullptr) {
         tft->setTextFont((uint8_t) mag);
@@ -103,6 +107,10 @@ void TfteSpiDrawable::fontPtrToNum(const void* font, int mag) {
     }
 }
 
+UnicodeFontHandler *TfteSpiDrawable::createFontHandler() {
+    return fontHandler = new UnicodeFontHandler(tft, tccore::ENCMODE_UTF8);
+}
+
 //
 // Sprite object
 //
@@ -115,7 +123,9 @@ bool TftSpriteAndConfig::initSprite(const Coord &spriteWhere, const Coord &sprit
     // if the area is too big, or the sprite is in use, don't proceed.
     if(spriteSize.x > size.x || spriteSize.y > size.y) return false;
 
-    this->fontHandler = root->getUnicodeHandler(false);
+    if(root->isTcUnicodeEnabled() && fontHandler == nullptr) {
+        fontHandler = new UnicodeFontHandler(&sprite, tccore::ENCMODE_UTF8);
+    }
 
     // create the sprite if needed
     if(!sprite.created()) {

examples/esp/esp32s3TftEncoder/tcMenuTfteSpi.cpp

@@ -34,7 +34,7 @@ class TfteSpiDrawable : public DeviceDrawable {
 
     DeviceDrawable *getSubDeviceFor(const Coord &where, const Coord& size, const color_t *palette, int paletteSize) override;
 
-    void drawText(const Coord &where, const void *font, int mag, const char *text) override;
+    void internalDrawText(const Coord &where, const void *font, int mag, const char *text) override;
 
     void drawBitmap(const Coord &where, const DrawableIcon *icon, bool selected) override;
 
@@ -46,11 +46,15 @@ class TfteSpiDrawable : public DeviceDrawable {
 
     void drawPolygon(const Coord *points, int numPoints, bool filled) override;
 
+    void drawPixel(uint16_t x, uint16_t y) override;
+
     void transaction(bool isStarting, bool redrawNeeded) override;
 
-    Coord textExtents(const void *font, int mag, const char *text, int *baseline) override;
+    Coord internalTextExtents(const void *font, int mag, const char *text, int *baseline) override;
     Coord getDisplayDimensions() override { return Coord(tft->width(), tft->height());}
     TFT_eSPI* getTFT() { return tft; }
+protected:
+    UnicodeFontHandler* createFontHandler() override;
 private:
     void fontPtrToNum(const void* font, int mag);
 };