#47 reverse change that prevented menu root being submenu, #48 title is now optional on LCD driver

Author: davetcc

examples/keyboardEthernetShield/keyboardEthernetShield.emf

@@ -1,6 +1,6 @@
 {
   "lastEdited": {
-    "seconds": 1585213908,
+    "seconds": 1585312211,
     "nanos": 0
   },
   "codeOptions": {

examples/keyboardEthernetShield/keyboardEthernetShield.ino

@@ -87,6 +87,8 @@ void setup() {
 	menuRemoteMonitor.addConnector(remoteServer.getRemoteConnector(0));
 	menuAuthKeyMgr.setLocalOnly(true);    
 
+    renderer.setTitleRequired(false);
+
 	setupMenu();
 
 	setupKeyboard();

examples/keyboardEthernetShield/tcMenuLiquidCrystal.cpp

@@ -23,6 +23,7 @@ LiquidCrystalRenderer::LiquidCrystalRenderer(LiquidCrystal& lcd, uint8_t dimX, u
 	this->forwardChar = '>';
 	this->editChar = '=';
     this->drewTitleThisTime = false;
+    this->titleRequired = true;
 }
 
 void LiquidCrystalRenderer::initialise() {
@@ -123,7 +124,7 @@ void LiquidCrystalRenderer::render() {
 	else {
 		MenuItem* item = menuMgr.getCurrentMenu();
 
-        bool titleNeeded = menuMgr.getCurrentMenu() == menuMgr.getRoot();
+        bool titleNeeded = titleRequired && menuMgr.getCurrentMenu() == menuMgr.getRoot();
 
 		// first we find the first currently active item in our single linked list
         int activeOffs = offsetOfCurrentActive(item);

examples/keyboardEthernetShield/tcMenuLiquidCrystal.h

@@ -34,12 +34,14 @@ class LiquidCrystalRenderer : public BaseMenuRenderer {
 	uint8_t forwardChar;
 	uint8_t editChar;
     bool drewTitleThisTime;
+    bool titleRequired;
 public:
 
 	LiquidCrystalRenderer(LiquidCrystal& lcd, uint8_t dimX, uint8_t dimY);
 	virtual ~LiquidCrystalRenderer();
 	void render() override;
     void initialise() override;
+    void setTitleRequired(bool titleRequired) { this->titleRequired = titleRequired; }
 
 	void setEditorChars(char back, char forward, char edit);
 

renderers/liquidcrystal/tcMenuLiquidCrystal.cpp

@@ -23,6 +23,7 @@ LiquidCrystalRenderer::LiquidCrystalRenderer(LiquidCrystal& lcd, uint8_t dimX, u
 	this->forwardChar = '>';
 	this->editChar = '=';
     this->drewTitleThisTime = false;
+    this->titleRequired = true;
 }
 
 void LiquidCrystalRenderer::initialise() {
@@ -123,7 +124,7 @@ void LiquidCrystalRenderer::render() {
 	else {
 		MenuItem* item = menuMgr.getCurrentMenu();
 
-        bool titleNeeded = menuMgr.getCurrentMenu() == menuMgr.getRoot();
+        bool titleNeeded = titleRequired && menuMgr.getCurrentMenu() == menuMgr.getRoot();
 
 		// first we find the first currently active item in our single linked list
         int activeOffs = offsetOfCurrentActive(item);
@@ -148,7 +149,8 @@ void LiquidCrystalRenderer::render() {
 			if (lastOffset != toOffsetBy) locRedrawMode = MENUDRAW_COMPLETE_REDRAW;
 			lastOffset = toOffsetBy;
 
-			while (item != NULL && toOffsetBy--) {
+			while (item != NULL && toOffsetBy) {
+                if(item->isVisible()) toOffsetBy = toOffsetBy - 1;
 				item = item->getNext();
 			}
 		}
@@ -159,10 +161,13 @@ void LiquidCrystalRenderer::render() {
 
 		// and then we start drawing items until we run out of screen or items
 		while (item && cnt < dimY) {
-			if (locRedrawMode != MENUDRAW_NO_CHANGE || item->isChanged()) {
-				renderMenuItem(cnt, item);
-			}
-			++cnt;
+            if(item->isVisible())
+            {
+                if (locRedrawMode != MENUDRAW_NO_CHANGE || item->isChanged()) {
+                    renderMenuItem(cnt, item);
+                }
+                ++cnt;
+            }
 			item = item->getNext();
 		}
 	}

renderers/liquidcrystal/tcMenuLiquidCrystal.h

@@ -34,12 +34,14 @@ class LiquidCrystalRenderer : public BaseMenuRenderer {
 	uint8_t forwardChar;
 	uint8_t editChar;
     bool drewTitleThisTime;
+    bool titleRequired;
 public:
 
 	LiquidCrystalRenderer(LiquidCrystal& lcd, uint8_t dimX, uint8_t dimY);
 	virtual ~LiquidCrystalRenderer();
 	void render() override;
     void initialise() override;
+    void setTitleRequired(bool titleRequired) { this->titleRequired = titleRequired; }
 
 	void setEditorChars(char back, char forward, char edit);
 

src/SecuredMenuPopup.cpp

@@ -46,7 +46,7 @@ int secPopupActionRenderFn(RuntimeMenuItem* item, uint8_t row, RenderFnMode mode
 	case RENDERFN_INVOKE:
 		if(act->getSecuredItem() != NULL) {
 			if (menuMgr.secureMenuInstance()->doesPinMatch()) {
-				menuMgr.setCurrentMenu(act->getSecuredItem());
+				menuMgr.setCurrentMenu(act->getSecuredItem()->getChild());
 			}
 			else {
 				BaseDialog* dlg = menuMgr.getRenderer()->getDialog();

src/tcMenu.cpp

@@ -144,16 +144,16 @@ void MenuManager::actionOnCurrentItem(MenuItem* toEdit) {
 	// if there's a new item specified in toEdit, it means we need to change
 	// the current editor (if it's possible to edit that value)
 	if (toEdit->getMenuType() == MENUTYPE_SUB_VALUE) {
-		if (toEdit->getMenuType() == MENUTYPE_SUB_VALUE && toEdit->isSecured() && authenticationManager != NULL) {
+	    SubMenuItem* subMenu = reinterpret_cast<SubMenuItem*>(toEdit);
+		if (subMenu->isSecured() && authenticationManager != NULL) {
 			serdebugF2("Submenu is secured: ", toEdit->getId());
-			SubMenuItem* subMenu = reinterpret_cast<SubMenuItem*>(toEdit);
 			SecuredMenuPopup* popup = secureMenuInstance();
 			popup->start(subMenu);
 			currentRoot = popup->getRootItem();
 			baseRenderer->prepareNewSubmenu();
 		}
 		else {
-			menuMgr.setCurrentMenu(toEdit);
+			menuMgr.setCurrentMenu(subMenu->getChild());
 		}
 	}
 	else if (toEdit->getMenuType() == MENUTYPE_RUNTIME_LIST) {
@@ -273,10 +273,6 @@ void MenuManager::setCurrentMenu(MenuItem * theItem) {
 	getParentAndReset();
 
 	MenuItem* root = theItem;
-	if (theItem->getMenuType() == MENUTYPE_SUB_VALUE) {
-		SubMenuItem* subMenu = reinterpret_cast<SubMenuItem*>(theItem);
-		root = subMenu->getChild();
-	}
 	currentRoot = root;
 	root->setActive(true);
 	baseRenderer->prepareNewSubmenu();