#175 #174 fix compile issue and ensure navigation works as expected.

Author: davetcc

library.json

@@ -26,7 +26,7 @@
         "authors": "DaveTCC"
       }
     ],
-    "version": "3.0.0",
+    "version": "3.0.1",
     "license": "Apache-2.0",
     "frameworks": "arduino, mbed",
     "platforms": "*"

library.properties

@@ -4,7 +4,7 @@
 #
 
 name=tcMenu
-version=3.0.0
+version=3.0.1
 maintainer=www.thecoderscorner.com
 author=davetcc
 category=Other

src/extras/DrawableDashboard.cpp

@@ -152,8 +152,9 @@ color_t DashMenuItem::staticPalette[4] = {};
 
 DashMenuItem::DashMenuItem(MenuItem *theItem, Coord topLeft, DashDrawParameters* params, int numCharsInValue,
                            const char* titleOverride, int countDownTicks) : item(theItem), screenLoc(topLeft),
-                               parameters(params), updateCountDown(countDownTicks), numChars(numCharsInValue),
-                               valueWidth(0), titleExtents(0, 0), countDownTicks(countDownTicks) {
+                               parameters(params), updateCountDown(countDownTicks), titleExtents(0, 0),
+                               numChars(numCharsInValue), valueWidth(0), countDownTicks(countDownTicks), baseline(0),
+                               titleText{} {
 
     if(titleOverride != nullptr) {
         strncpy(titleText, titleOverride, sizeof(titleText));
@@ -173,7 +174,7 @@ bool DashMenuItem::needsPainting() {
     return item->isChanged() || updateCountDown != 0;
 }
 
-void DashMenuItem::setFont(DashDrawParameters* params, UnicodeFontHandler* unicodeHandler) {
+void DashMenuItem::setFont(UnicodeFontHandler* unicodeHandler) {
     if(parameters->isAdafruitFont()) {
         unicodeHandler->setFont(parameters->getAsAdaFont());
     } else {
@@ -183,7 +184,7 @@ void DashMenuItem::setFont(DashDrawParameters* params, UnicodeFontHandler* unico
 
 void DashMenuItem::paintTitle(DeviceDrawable* drawableRoot) {
     UnicodeFontHandler* unicodeHandler = drawableRoot->getUnicodeHandler(true);
-    setFont(parameters, unicodeHandler);
+    setFont(unicodeHandler);
     titleExtents = unicodeHandler->textExtents(titleText, &baseline);
     valueWidth = unicodeHandler->textExtents("0", &baseline).x * numChars;
     valueWidth = int(valueWidth * 1.20);
@@ -199,7 +200,7 @@ void DashMenuItem::paintTitle(DeviceDrawable* drawableRoot) {
 
     unicodeHandler->setDrawColor(wrapper.fgColUnderlying());
     unicodeHandler->setCursor(wrapper.offsetLocation(screenLoc, startX, titleExtents.y - baseline));
-    setFont(parameters, unicodeHandler);
+    setFont(unicodeHandler);
     unicodeHandler->print(titleText);
 
     wrapper.endDraw();
@@ -216,10 +217,9 @@ void DashMenuItem::paintItem(DeviceDrawable* drawableRoot) {
 
     UnicodeFontHandler* unicodeHandler = wrapper.getDrawable()->getUnicodeHandler(true);
     unicodeHandler->setDrawColor(wrapper.fgColUnderlying());
-    setFont(parameters, unicodeHandler);
+    setFont(unicodeHandler);
     auto padding = 0;
     if(!parameters->isValueLeftAlign()) {
-        int baseline;
         Coord valueLen = unicodeHandler->textExtents(sz, &baseline);
         padding = valueWidth - (valueLen.x + 4);
     }

src/extras/DrawableDashboard.h

@@ -221,7 +221,7 @@ class DashMenuItem {
     char titleText[20];
 public:
     DashMenuItem() : item(nullptr), screenLoc(0, 0), parameters(nullptr), updateCountDown(0), titleExtents(0, 0),
-                     numChars(0), valueWidth(0), countDownTicks(0), titleText() {}
+                     numChars(0), valueWidth(0), countDownTicks(0), baseline(0), titleText() {}
     DashMenuItem(MenuItem *theItem, Coord topLeft, DashDrawParameters* params, int numCharsInValue, const char* titleOverride, int countDownTicks);
     DashMenuItem(const DashMenuItem &other) = default;
     DashMenuItem& operator= (const DashMenuItem& other) = default;
@@ -231,7 +231,7 @@ class DashMenuItem {
     }
 
     bool needsPainting();
-    void setFont(DashDrawParameters* params, UnicodeFontHandler* unicodeHandler);
+    void setFont(UnicodeFontHandler* unicodeHandler);
     void paintTitle(DeviceDrawable* canvasDrawable);
     void paintItem(DeviceDrawable* canvasDrawable);
 };

src/tcMenu.cpp

@@ -155,7 +155,7 @@ void MenuManager::actionOnSubMenu(MenuItem* nextSub) {
 		navigateToMenu(popup->getRootItem(), popup->getItemToActivate(), true);
 	}
 	else {
-		navigateToMenu(subMenu->getChild());
+		navigateToMenu(subMenu->getChild(), findCurrentActive());
 	}
 }
 

src/tcMenuVersion.h

@@ -18,7 +18,7 @@ namespace tccore {
 // here we define the version as both a string and separate field
 #define TCMENU_MAJOR 3
 #define TCMENU_MINOR 0
-#define TCMENU_PATCH 0
+#define TCMENU_PATCH 1
 
 /**
  * A helper to generate the major minor version numbers used in the protocol