menu actions can now return bool to quit menu (true=quit)

Author: neu-rah

menu.cpp

@@ -72,9 +72,9 @@ int menu::menuKeys(menuOut &p,Stream& c,bool canExit) {
 //	...->draw -> input scan -> iterations -> [activate submenu or user function] -> ...
 // draw: call target device object
 //input scan: call the navigation function (self)
-void menu::activate(menuOut& p,Stream& c,bool canExit) {
+promptFeedback menu::activate(menuOut& p,Stream& c,bool canExit) {
 	if (activeNode!=this) {
-    action(*this,p,c);
+    if (action(*this,p,c)) return true;
 		previousMenu=(menu*)activeNode;
 		activeNode=this;
 		sel=0;
@@ -88,13 +88,18 @@ void menu::activate(menuOut& p,Stream& c,bool canExit) {
   	sel=op;
     if (data[op]->enabled) {
       printMenu(p,canExit);//clearing old selection
-    	data[op]->activate(p,c,true);
+      if (data[op]->activate(p,c,true)) {
+        p.clear();
+      	activeNode=previousMenu;
+        return true;
+      }
     }
   } else if (op==-1) {//then exit
     p.clear();
   	activeNode=previousMenu;
 	 	c.flush();//reset the encoder
   }
+  return 0;
 }
 
 void menu::poll(menuOut& p,Stream& c,bool canExit) {

menu.h

@@ -92,7 +92,7 @@ v2.1 - Add full support of SetPosition(x,y) to move the menu inside the screen (
   template<>
   int (*)(prompt &p, menuOut &o, Stream &i) operator(void (*f)(prompt &p, menuOut &o, Stream &i)) {return devoid<f>;}*/
 
-  #define promptFeedback void
+  #define promptFeedback bool
 
 	class promptAction {
 	public:
@@ -114,7 +114,7 @@ v2.1 - Add full support of SetPosition(x,y) to move the menu inside the screen (
   class prompt {
     public:
     const char* text;
-    static promptFeedback nothing() {}
+    static promptFeedback nothing() {return false;}
     promptAction action;
     bool enabled;
     inline prompt(const char * text):text(text),enabled(true),action(nothing) {}
@@ -123,9 +123,8 @@ v2.1 - Add full support of SetPosition(x,y) to move the menu inside the screen (
     virtual void printTo(menuOut& p) {
 			p.print(text);
 		}
-    virtual void activate(menuOut& p,Stream&c,bool) {
-      //Serial.println("prompt::activate");
-    	action(*this,p,c);
+    virtual promptFeedback activate(menuOut& p,Stream&c,bool) {
+      return action(*this,p,c);
     }
     virtual bool isMenu() const {return false;}
   };
@@ -177,7 +176,7 @@ v2.1 - Add full support of SetPosition(x,y) to move the menu inside the screen (
       sel=(idx>=sz||idx<0)?sz-1:idx;//focus idx option if out of range then the last will be selected
     }
 
-    void activate(menuOut& p,Stream& c,bool canExit=false);
+    promptFeedback activate(menuOut& p,Stream& c,bool canExit=false);
 
     void poll(menuOut& p,Stream& c,bool canExit=false);
 

menuFields.h

@@ -68,18 +68,19 @@ v2.0 - 	Calling action on every elements
       else if (value>high) value=high;
 		}
 		//lazy drawing, we have no drawing position here... so we will ask the menu to redraw
-		virtual void activate(menuOut& p,Stream&c,bool canExit=false) {
+		virtual promptFeedback activate(menuOut& p,Stream&c,bool canExit=false) {
 			if (activeNode!=this) {
-				action(*this,p,c);
+				if (action(*this,p,c)) return true;;
 			  ox=activeNode->ox;
 			  oy=activeNode->oy;
 				previousMenu=(menu*)activeNode;
 				activeNode=this;
       	p.lastSel=-1;
       	previousMenu->printMenu(p,previousMenu->canExit);
 			}
+			//printing here to solve U8GLX blank screen on field edit
 			previousMenu->printMenu(p,previousMenu->canExit);
-			if (!c.available()) return;
+			if (!c.available()) return 0;
 			if (strchr(numericChars,c.peek())) {//a numeric value was entered
       	value=c.parseFloat();
     		tunning=false;
@@ -104,6 +105,7 @@ v2.0 - 	Calling action on every elements
       	p.lastSel=-1;
       	previousMenu->printMenu(p,previousMenu->canExit);
       }
+			return 0;
 		}
 	};
 
@@ -133,9 +135,9 @@ v2.0 - 	Calling action on every elements
 	    menuSelect<T>(target,text,sz,data) {menuSelect<T>::sync();}
 
 		//ignore canExit (this exists by select), however we could use a cancel option instead of Exit
-		void activate(menuOut& p,Stream& c,bool) {
+		promptFeedback activate(menuOut& p,Stream& c,bool) {
 			if (menu::activeNode!=this) {
-				menuSelect<T>::action(*this,p,c);
+				if (menuSelect<T>::action(*this,p,c)) return true;
 			  this->setPosition(menuNode::activeNode->ox,menuNode::activeNode->oy);
 				this->menu::previousMenu=(menu*)menu::activeNode;
 				menu::activeNode=this;
@@ -156,6 +158,7 @@ v2.0 - 	Calling action on every elements
 				 	c.flush();//reset the encoder
 				}
 			}
+			return 0;
 		}
 	};
 	template<typename T>
@@ -165,16 +168,17 @@ v2.0 - 	Calling action on every elements
 		menuToggle(const char *text,unsigned int sz,menuValue<T>* const data[],T& target):
 	    menuSelect<T>(target,text,sz,data) {menuSelect<T>::sync();}
 
-		void activate(menuOut& p,Stream& c,bool canExit) {
+		promptFeedback activate(menuOut& p,Stream& c,bool canExit) {
 			//Serial.println("entering toggle");
-			menuSelect<T>::action(*this,p,c);
+			if (menuSelect<T>::action(*this,p,c)) return true;
 		  /*ox=activeNode->ox;
 		  oy=activeNode->oy;*/
 			this->menu::sel++;
 			if (this->menu::sel>=this->menu::sz) this->menu::sel=0;
 		 	p.lastSel=-1;//redraw only affected option
 			this->menuSelect<T>::target=((menuValue<T>*)this->menu::data[menu::sel])->value;
 			this->menu::data[this->menu::sel]->activate(p,c,true);
+			return 0;
 		}
 	};
 #endif