fix choose bug

choose field was showing values on edit, and it should not. That was
noticeable on U8G2.

Author: neu-rah

examples/U8G2/U8G2/U8G2.ino

@@ -221,7 +221,7 @@ void setup() {
   #endif
   u8g2.begin();
   u8g2.setFont(fontName);
-  u8g2.setBitmapMode(0);
+  // u8g2.setBitmapMode(0);
 
   //disable second option
   mainMenu[1].enabled=disabledStatus;

examples/U8x8/U8x8/U8x8.ino

@@ -37,13 +37,22 @@ const char* constMEM hexDigit MEMMODE="0123456789ABCDEF";
 const char* constMEM hexNr[] MEMMODE={"0","x",hexDigit,hexDigit};
 char buf1[]="0x11";//<-- menu will edit this text
 
+int chooseTest=-1;
+CHOOSE(chooseTest,chooseMenu,"Choose",doNothing,noEvent,noStyle
+  ,VALUE("First",1,doNothing,noEvent)
+  ,VALUE("Second",2,doNothing,noEvent)
+  ,VALUE("Third",3,doNothing,noEvent)
+  ,VALUE("Last",-1,doNothing,noEvent)
+);
+
 MENU(mainMenu,"Main menu",doNothing,noEvent,wrapStyle
   ,OP("Op1",doNothing,noEvent)
   ,EDIT("Hex",buf1,hexNr,doNothing,noEvent,noStyle)
+  ,SUBMENU(chooseMenu)
   ,EXIT("<Back")
 );
 
-#define MAX_DEPTH 1
+#define MAX_DEPTH 2
 
 MENU_OUTPUTS(out,MAX_DEPTH
   ,SERIAL_OUT(Serial)

examples/UCGLib/UCGLib/UCGLib.ino

@@ -43,13 +43,22 @@ const char* constMEM hexDigit MEMMODE="0123456789ABCDEF";
 const char* constMEM hexNr[] MEMMODE={"0","x",hexDigit,hexDigit};
 char buf1[]="0x11";//<-- menu will edit this text
 
+int chooseTest=-1;
+CHOOSE(chooseTest,chooseMenu,"Choose",doNothing,noEvent,noStyle
+  ,VALUE("First",1,doNothing,noEvent)
+  ,VALUE("Second",2,doNothing,noEvent)
+  ,VALUE("Third",3,doNothing,noEvent)
+  ,VALUE("Last",-1,doNothing,noEvent)
+);
+
 MENU(mainMenu,"Main menu",doNothing,noEvent,wrapStyle
   ,OP("Op1",doNothing,noEvent)
   ,EDIT("Hex",buf1,hexNr,doNothing,noEvent,noStyle)
+  ,SUBMENU(chooseMenu)
   ,EXIT("<Back")
 );
 
-#define MAX_DEPTH 1
+#define MAX_DEPTH 2
 
 //define colors
 #define BLACK {0,0,0}

library.properties

@@ -1,5 +1,5 @@
 name=ArduinoMenu library
-version=4.0.9
+version=4.0.10
 author=Rui Azevedo, [email protected]
 maintainer=neu-rah, [email protected]
 sentence=AVR generic menu/interactivity system

src/items.cpp

@@ -305,12 +305,15 @@ Used menuVariantBase::printTo(navRoot &root,bool sel,menuOut& out, idx_t idx,idx
   out.print(this==&root.active()?':':' ');
   l--;
   #ifdef MENU_FMT_WRAPS
-  if (out.fmtStart(type()==selectClass?menuOut::fmtSelect:menuOut::fmtChoose,root.node(),idx)==proceed) {
+    if (out.fmtStart(type()==selectClass?menuOut::fmtSelect:menuOut::fmtChoose,root.node(),idx)==proceed) {
   #endif
+    // Serial<<"variant ";
+    // print_P(Serial,operator[](at).getText());
+    // Serial<<endl;
     out.setColor(valColor,sel,prompt::enabled,ed);
     if (l>0) l-=operator[](at).printRaw(out,l);
   #ifdef MENU_FMT_WRAPS
-  }
+    }
   #endif
   #ifdef MENU_FMT_WRAPS
   out.fmtEnd(type()==selectClass?menuOut::fmtSelect:menuOut::fmtChoose,root.node(),idx);

src/items.h

@@ -368,6 +368,7 @@
         #ifdef MENU_FMT_WRAPS
           virtual classes type() const {return chooseClass;}
         #endif
+        Used printTo(navRoot &root,bool sel,menuOut& out, idx_t idx,idx_t len,idx_t panelNr=0) override;
         result sysHandler(SYS_FUNC_PARAMS) override;
         bool changed(const navNode &nav,const menuOut& out,bool sub=true) override {
           return menuVariant<T>::changed(nav,out)||menuNode::changed(nav,out);
@@ -411,6 +412,14 @@
       void menuField<T>::printLow(menuOut& o) const {o.print(low());}
     #endif
 
+    template<typename T>
+    Used choose<T>::printTo(navRoot &root,bool sel,menuOut& out, idx_t idx,idx_t len,idx_t panelNr) {
+      bool ed=this==root.navFocus;
+      return ed?
+        prompt::printTo(root,sel,out,idx,len,panelNr)
+        :menuVariantBase::printTo(root,sel,out,idx,len,panelNr);
+    }
+
     template<typename T>
     Used toggle<T>::printTo(navRoot &root,bool sel,menuOut& out, idx_t idx,idx_t len,idx_t panelNr) {
       return menuVariantBase::togglePrintTo(root,sel,out,idx,len,panelNr);

src/nav.h

@@ -137,7 +137,7 @@
           }
           //async printMenu on arbitrary menuOut device
           Used printMenu(menuOut& o) const {
-            _trace(Serial<<"navRoot::printMenu(menuOut& o)"<<endl);
+            trace(Serial<<"navRoot::printMenu(menuOut& o)"<<endl);
             if ((active().sysStyles()&_parentDraw)&&level)
               return o.printMenu(path[level-1]);
             else return o.printMenu(node());
@@ -188,7 +188,10 @@
     };
 
     #ifdef DEBUG
-      inline Stream& operator<<(Stream&o,const navNode& p) {return o<<*(prompt*)p.target;}
+      inline Stream& operator<<(Stream&o,const navNode& p) {
+        o.print((__FlashStringHelper*)p.target->getText());
+        return o;
+      }
       inline Stream& operator<<(Stream&o,const navRoot& p) {return o<<p.node();}
     #endif