Fixes before release.

Author: davetcc

examples/arduino32/dynamicMenuItems/dynamicMenuItems.ino

@@ -333,9 +333,12 @@ int CALLBACK_FUNCTION fnListRtCall(RuntimeMenuItem* item, uint8_t row, RenderFnM
         Serial.print("Activated "); Serial.println(row);
         return true;
     } else if(mode == RENDERFN_INVOKE) {
-        Serial.print("Selected "); Serial.println(row);
-        // do something with the selected item.
-        menuMgr.resetMenu(false);
+        if(row != LIST_PARENT_ITEM_POS) {
+            Serial.print("Selected ");
+            Serial.println(row);
+            // do something with the selected item.
+            menuMgr.resetMenu(false);
+        }
         return true;
     } else if(mode == RENDERFN_VALUE && row < numListItems) {
         // if the value is in range we copy the value from our array

examples/esp/esp32s3TftEncoder/esp32s3TftEncoder.ino

@@ -8,6 +8,7 @@
 #include "app_icondata.h"
 #include "tcMenuVersion.h"
 #include <IoLogging.h>
+#include <stockIcons/wifiAndConnectionIcons16x12.h>
 
 //
 // We use a card layout to present the items, here we demonstrate how to set it up and prepare custom menu items that
@@ -19,6 +20,8 @@
 DrawableIcon iconLeft(-1, Coord(11, 22), tcgfx::DrawableIcon::ICON_XBITMAP, ArrowHoriz11x22BitmapLeft, nullptr);
 DrawableIcon iconRight(-1, Coord(11, 22), tcgfx::DrawableIcon::ICON_XBITMAP, ArrowHoriz11x22BitmapRight, nullptr);
 
+TitleWidget titleWidget(iconsEthernetConnection, 2, 16, 12);
+
 void setupGridLayoutForCardView() {
     auto & factory = renderer.getGraphicsPropertiesFactory();
 
@@ -43,6 +46,7 @@ void setup() {
     Serial.begin(115200);
 
     serEnableLevel(SER_TCMENU_DEBUG, true);
+    renderer.setFirstWidget(&titleWidget);
     setupMenu();
 
     // Here we enable the card layout mode for the main menu by first enabling support, then adding the root menu.
@@ -56,10 +60,14 @@ void setup() {
     });
 
     // every second we simulate updating the battery condition indicators.
-    taskManager.scheduleFixedRate(1, [] {
+    taskManager.schedule(repeatSeconds(1), [] {
         menuBatteryCharge.setCurrentValue(rand() % 100);
         menuBatteryCondition.setCurrentValue(rand() % 3);
-    }, TIME_SECONDS);
+    });
+
+    taskManager.schedule(repeatSeconds(30), [] {
+        titleWidget.setCurrentState(rand() % 2);
+    });
 }
 
 void loop() {

src/RuntimeMenuItem.cpp

@@ -101,11 +101,11 @@ RuntimeMenuItem *ListRuntimeMenuItem::asParent() {
 }
 
 RuntimeMenuItem *ListRuntimeMenuItem::asBackMenu() {
+    menuType = MENUTYPE_BACK_VALUE;
+    itemPosition = LIST_PARENT_ITEM_POS;
     if(activeItem == 0) {
         runCallback();
     }
-    menuType = MENUTYPE_BACK_VALUE;
-    itemPosition = LIST_PARENT_ITEM_POS;
     return this;
 }
 

src/graphics/BaseGraphicalRenderer.cpp

@@ -96,11 +96,15 @@ void BaseGraphicalRenderer::subMenuRender(MenuItem* rootItem, uint8_t& locRedraw
         auto* pEntry = itemOrderByRow.itemAtIndex(0);
         drawMenuItem(pEntry, Coord(0,0), Coord(int(width), drawingLocation.getStartY()), DrawingFlags(drawCompleteScreen, activeItem == pEntry->getMenuItem(), menuMgr.getCurrentEditor() == pEntry->getMenuItem()));
         forceDrawWidgets = true;
+        setTitleOnDisplay(true);
+    } else if(itemOrderByRow.count() > 0){
+        bool drawingTitle = itemOrderByRow.itemAtIndex(0)->getPosition().getDrawingMode() == GridPosition::DRAW_TITLE_ITEM;
+        setTitleOnDisplay(drawingTitle && startRow == 0);
     }
 
     // and then we start drawing items until we run out of screen or items
     if(drawTheMenuItems(startRow, drawingLocation.getStartY(), drawCompleteScreen)) forceDrawWidgets = true;
-    setTitleOnDisplay((titleMode == TITLE_FIRST_ROW && startRow == 0) || titleMode == TITLE_ALWAYS);
+
 }
 
 GridPositionRowCacheEntry* BaseGraphicalRenderer::findMenuEntryAndDimensions(const Coord& screenPos, Coord& localStart, Coord& localSize) {
@@ -362,8 +366,10 @@ bool BaseGraphicalRenderer::areRowsOutOfOrder() {
 }
 
 void BaseGraphicalRenderer::redrawAllWidgets(bool forceRedraw) {
-    if(!isTitleOnDisplay() || itemOrderByRow.count() == 0) return;
-    if(itemOrderByRow.itemAtIndex(0)->getPosition().getDrawingMode() != GridPosition::DRAW_TITLE_ITEM) return;
+    if(itemOrderByRow.count() == 0 || !isTitleOnDisplay()) return;
+    if(itemOrderByRow.itemAtIndex(0)->getPosition().getDrawingMode() != GridPosition::DRAW_TITLE_ITEM) {
+        if(drawingLocation.getCurrentOffset() != 0) return;
+    }
 
     auto* displayProps = itemOrderByRow.itemAtIndex(0)->getDisplayProperties();
     auto widFg = displayProps->getColor(ItemDisplayProperties::HIGHLIGHT1);

src/graphics/GraphicsDeviceRenderer.cpp

@@ -466,17 +466,21 @@ namespace tcgfx {
                 forceDrawWidgets = true;
             }
             if (titleNeeded && (locRedrawMode == MENUDRAW_COMPLETE_REDRAW || titleEntry->getMenuItem()->isChanged(displayNumber))) {
-                drawMenuItem(titleEntry, Coord(0, 0), cardLayoutPane->getTitleSize(), DrawingFlags(true, activeItem == titleEntry->getMenuItem(), menuMgr.getCurrentEditor() == titleEntry->getMenuItem()));
+                bool active = titleNeeded && activeItem == titleEntry->getMenuItem();
+                drawMenuItem(titleEntry, Coord(0, 0), cardLayoutPane->getTitleSize(), DrawingFlags(true, active, menuMgr.getCurrentEditor() == titleEntry->getMenuItem()));
+                forceDrawWidgets = true;
             }
             if (entry->getMenuItem()->isChanged(displayNumber) || locRedrawMode == MENUDRAW_COMPLETE_REDRAW) {
                 getDeviceDrawable()->setDrawColor(entry->getDisplayProperties()->getColor(ItemDisplayProperties::BACKGROUND));
                 getDeviceDrawable()->drawBox(cardLayoutPane->getMenuLocation(), cardLayoutPane->getMenuSize(), true);
                 int offsetY = (cardLayoutPane->getMenuSize().y - int(entry->getHeight())) / 2;
                 Coord menuStart(cardLayoutPane->getMenuLocation().x, cardLayoutPane->getMenuLocation().y + offsetY);
                 Coord menuSize(cardLayoutPane->getMenuSize().x, int(entry->getHeight()));
-                drawMenuItem(entry, menuStart, menuSize, DrawingFlags(false, activeItem == titleEntry->getMenuItem(), menuMgr.getCurrentEditor() == titleEntry->getMenuItem()));
+                bool active = titleNeeded && activeItem == entry->getMenuItem();
+                drawMenuItem(entry, menuStart, menuSize, DrawingFlags(false, active, menuMgr.getCurrentEditor() == entry->getMenuItem()));
             }
             cardLayoutPane->prepareAndPaintButtons(this, activeIndex, itemOrderByRow.count(), titleMode != NO_TITLE);
+            setTitleOnDisplay(true);
         } else {
             if(locRedrawMode == MENUDRAW_COMPLETE_REDRAW && cardLayoutPane != nullptr) {
                 cardLayoutPane->notInUse();

src/tcMenuKeyboard.cpp

@@ -73,7 +73,9 @@ void MenuEditingKeyListener::keyPressed(char key, bool held) {
         clearState();
         menuMgr.resetMenu(held);
     } else if (key == enterKey) {
-        clearState();
+        if(menuMgr.getCurrentEditor() && menuMgr.getCurrentEditor()->getMenuType() != MENUTYPE_RUNTIME_LIST) {
+            clearState();
+        }
         menuMgr.onMenuSelect(held);
         if(menuMgr.getCurrentEditor() && menuMgr.getCurrentEditor()->getMenuType() == MENUTYPE_INT_VALUE) {
             processAnalogKeyPress(reinterpret_cast<AnalogMenuItem*>(menuMgr.getCurrentEditor()), key);