ready for 3.0 release - small fix

Author: davetcc

examples/arduino32/piPicoTftEncoder/piPicoTftEncoder.ino

@@ -45,7 +45,8 @@ void setup() {
     }, NO_REPEAT);
 
     // and initialise the list menu item with the number of rows, see the list callback function below
-    menuRootList.setNumberOfRows(FILE_NAME_SIZE);
+    // we set the number of items to all the files plus the refresh item
+    menuRootList.setNumberOfRows(FILE_NAME_SIZE + 1);
 }
 
 void loop() {
@@ -154,16 +155,32 @@ void CALLBACK_FUNCTION onShowDialogs(int) {
 int CALLBACK_FUNCTION fnRootListRtCall(RuntimeMenuItem* item, uint8_t row, RenderFnMode mode, char* buffer, int bufferSize) {
    switch(mode) {
     case RENDERFN_INVOKE:
-        serlogF2(SER_DEBUG, "List invoke: ", row);
-        menuMgr.resetMenu(false); // drop back one level dismissing the list
-        reinterpret_cast<ListRuntimeMenuItem*>(item)->asParent();
+        // we have a list of files and a refresh option at the end.
+        if(row < FILE_NAME_SIZE) {
+            // a file has been selected, dismiss list.
+            serlogF2(SER_DEBUG, "List invoke: ", row);
+            menuMgr.resetMenu(false); // drop back one level dismissing the list
+            reinterpret_cast<ListRuntimeMenuItem *>(item)->asParent();
+        } else {
+            // refresh was selected, refresh and force recalc.
+            item->setNumberOfRows(item->getNumberOfRows() + 1);
+            menuMgr.recalculateListIfOnDisplay(item);
+        }
         return true;
     case RENDERFN_NAME:
         strncpy(buffer, "Choose File", bufferSize);
         return true;
     case RENDERFN_VALUE:
-        if(row < FILE_NAME_SIZE) {
+        if(row == LIST_PARENT_ITEM_POS) {
+            // no value on the parent item, IE when this list is displayed in a parent menu.
+            buffer[0]=0;
+        } else if(row < FILE_NAME_SIZE) {
+            // copy the file name into the buffer
             strncpy(buffer, fileNames[row], bufferSize);
+        } else if(row == FILE_NAME_SIZE) {
+            strcpy(buffer, "Add more");
+        } else {
+            ltoaClrBuff(buffer, row, 4, '0', bufferSize);
         }
         return true;
     case RENDERFN_EEPROM_POS: return 0xffff; // lists are generally not saved to EEPROM

examples/arduino32/picoAdafruitDashboard/dashboardConfig.h

@@ -1,3 +1,4 @@
+// A few references from the dashboard source exported for the main file.
 
 #ifndef TCEXAMPLE_DASHBOARDCONFIG_H
 #define TCEXAMPLE_DASHBOARDCONFIG_H

src/tcMenu.cpp

@@ -484,9 +484,14 @@ bool MenuManager::isWrapAroundEncoder(MenuItem* menuItem) {
     return useWrapAroundByDefault;
 }
 
-void MenuManager::majorOrderChangeApplied(int newMax) {
-    if(renderer->getRendererType() == RENDER_TYPE_CONFIGURABLE && getCurrentMenu()->getMenuType() != MENUTYPE_RUNTIME_LIST) {
-        setItemsInCurrentMenu(newMax);
+void MenuManager::recalculateListIfOnDisplay(RuntimeMenuItem* runtimeItem) {
+    auto enc = switches.getEncoder();
+    // if there is an encoder, and the current menu is the list..
+    if(enc && navigator.getCurrentRoot() == runtimeItem) {
+        auto newRows = runtimeItem->getNumberOfRows();
+        auto encVal = enc->getCurrentReading();
+        uint8_t newPos = encVal < newRows ? encVal : (newRows - 1);
+        setItemsInCurrentMenu(newRows, newPos);
     }
 }
 

src/tcMenu.h

@@ -446,7 +446,12 @@ class MenuManager {
      */
     void addChangeNotification(MenuManagerObserver* observer);
 
-    void majorOrderChangeApplied(int newMax);
+    /**
+     * This provides support for when lists are on the display, to allow the encoder to be updated so it can present
+     * the new items. If the list is not on display, nothing is done.
+     * @param runtimeItem
+     */
+    void recalculateListIfOnDisplay(RuntimeMenuItem* runtimeItem);
 
     void setEditorHints(CurrentEditorRenderingHints::EditorRenderingType hint, size_t start=0, size_t end=0);
     const CurrentEditorRenderingHints& getEditorHints() { return renderingHints; }